From patchwork Mon Mar 6 03:31:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 64416 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1639614wrd; Sun, 5 Mar 2023 19:32:22 -0800 (PST) X-Google-Smtp-Source: AK7set9ZmHVeYXVC5XW/QDzA9jyYmGEyvFr0s9CcJOw/xVWjXtGf+oCkdV9uM3/8IzlVfuyJmlPN X-Received: by 2002:a50:ed94:0:b0:4bc:7eb9:4b2c with SMTP id h20-20020a50ed94000000b004bc7eb94b2cmr8815960edr.35.1678073542460; Sun, 05 Mar 2023 19:32:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678073542; cv=none; d=google.com; s=arc-20160816; b=gMSnNONLYlgn/jlqM9RTkQduo3EVZN03rdm61weo+l4TLFsKPweiqCs9K1Y/0tjT4V VstSTkN8UjNrqbTniwaep14jAtpxhnwFyM8YTPjgoWz8hVXeO24mpwfdg8deuG2xvIHZ x8nCULiEPfC1OX+PuhNylYcCwjNZBQO5khWl+gp1t2npD5nxRmRyZfqmMCmbsHXE8kUX 53b1eK0BwyV+1HVOfLRb34nhQFaetdleJXsG9xY9ZR1DH+cJPpmgL0wFP9GLQO/G7N7B oFJ+6mJmlVWfIQpegCcpp8+R39CKycXwYNWeq7p8U9kx7kFWL0QLcz77ea0JNZAd+g9f F3TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=Nqk/McQEXP9EcnyVNqEZ9NTEUBy0vMPLkS+AARKT2vM=; b=YkQXTHaPTJ7YyF5MjRU9T+1YLPT2YdybJklsyhjYcKdCzvyeYo3YOsheU+WFRJW58M arKToWpGbvT8IsREo/omLYB6duZdpYVGcUzGufgUHMWoU/xZp9ziHgIMBVxpP7Q2prk6 8P/MdQgAPXsD+fq9Ne1M5H4DJ3UlavOihvmCFIdNrhgPFWBMu/9TfGSuraeJAv8Xztsb jkTb7X9fMHmrldgu3qGg5Msr6HqUs6cFajN907YnOv0obwZOlG1p+/WzSV/bfUxLWr7P hYG6URXs+UK2usiOrMALO7cuXUlTVcAA2R+oxiUTnXjzF4TsEaBROJ0Ryq1baV89tty8 89xA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=tVtwmYDu; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id l15-20020a056402028f00b004af627b3205si9266307edv.641.2023.03.05.19.32.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Mar 2023 19:32:22 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=tVtwmYDu; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 731AE3858414 for ; Mon, 6 Mar 2023 03:32:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 731AE3858414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678073541; bh=Nqk/McQEXP9EcnyVNqEZ9NTEUBy0vMPLkS+AARKT2vM=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=tVtwmYDu641p/MxeSB4tSsXdH913lEzZo49N2NDY3lzl81MD73LAoJeLoAnQgGCPD /9vGNSut0tJRSqA5iYEsl/3aePylNTuagzrwZ+bpsSUM0POk7hRcC0qAdhngdT8r/D FyHGannTyffZ6UF2BycDsKiSQ26MhRK4/bmwHGGI= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by sourceware.org (Postfix) with ESMTPS id B62E9385AC39 for ; Mon, 6 Mar 2023 03:31:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B62E9385AC39 Received: by mail-pl1-x632.google.com with SMTP id p6so8880565plf.0 for ; Sun, 05 Mar 2023 19:31:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678073509; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Nqk/McQEXP9EcnyVNqEZ9NTEUBy0vMPLkS+AARKT2vM=; b=b8/8R5mr7iO2Q75P15326EkGBCpGfEaqST6X8fbb51wY/Q5vlC1sav+9br4QEn9wTE ZHyoKr1ppRFvxwZoyUdM8TpoQ4cnBsSCknGcivDcQ0nDmmWTsPQphxp2a+XFS7z+5h6O B5pUILdUID5a4+tSUi4HLxxF1QaoWXHII6VDERaTfIxYkm7cykax7ArrOz8HD6I0kSQt 14aXpl/a/rM3slHf/KcDSuLcNbvDq18vmQXl9/KrT3ZXylb3GiB3lc12UUcH0hiLFa+s 0k/r+Cbr8ssHxPuJ/qwtgGy+EZbAiIHnsFnzfut5qRmx8UasM5VOVW01/FU16UFSHRcI b/1Q== X-Gm-Message-State: AO0yUKV8knjliCDavnUKCr0TLzPEwONTM2d9GMVo7hbf/BqvqFx103dv Dd8snBTLwq8F40jTdZXpq7n/+e2+3JU= X-Received: by 2002:a17:90a:1913:b0:233:f786:35ca with SMTP id 19-20020a17090a191300b00233f78635camr9720635pjg.35.1678073509616; Sun, 05 Mar 2023 19:31:49 -0800 (PST) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:706e:b31e:8824:abae]) by smtp.gmail.com with ESMTPSA id d7-20020a17090a498700b002340b2c62e7sm6705292pjh.55.2023.03.05.19.31.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Mar 2023 19:31:49 -0800 (PST) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 4349D1142C90; Mon, 6 Mar 2023 14:01:47 +1030 (ACDT) Date: Mon, 6 Mar 2023 14:01:47 +1030 To: binutils@sourceware.org Subject: Correct odd loop in ecoff lookup_line Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3034.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alan Modra via Binutils From: Alan Modra Reply-To: Alan Modra Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759587642923600066?= X-GMAIL-MSGID: =?utf-8?q?1759587642923600066?= I can't see why this really odd looking loop was written the way it was in commit a877f5917f90, but it can result in a buffer overrun. * ecofflink.c (lookup_line): Don't swap in pdr at pdr_end. diff --git a/bfd/ecofflink.c b/bfd/ecofflink.c index 422ce57f430..00f1e3da404 100644 --- a/bfd/ecofflink.c +++ b/bfd/ecofflink.c @@ -2093,7 +2093,7 @@ lookup_line (bfd *abfd, because we iterate over every FDR rather than just ones with a base address less than or equal to 'offset'. */ bfd_signed_vma dist = -1, min_dist = -1; - char *pdr_hold; + char *pdr_hold = NULL; char *pdr_end; fdr_ptr = tab[i].fdr; @@ -2101,17 +2101,14 @@ lookup_line (bfd *abfd, pdr_ptr = ((char *) debug_info->external_pdr + fdr_ptr->ipdFirst * external_pdr_size); pdr_end = pdr_ptr + fdr_ptr->cpd * external_pdr_size; - (*debug_swap->swap_pdr_in) (abfd, pdr_ptr, &pdr); /* Find PDR that is closest to OFFSET. If pdr.prof is set, the procedure entry-point *may* be 0x10 below pdr.adr. We simply pretend that pdr.prof *implies* a lower entry-point. This is safe because it just means that may identify 4 NOPs in front of the function as belonging to the function. */ - for (pdr_hold = NULL; - pdr_ptr < pdr_end; - (pdr_ptr += external_pdr_size, - (*debug_swap->swap_pdr_in) (abfd, pdr_ptr, &pdr))) + for (; pdr_ptr < pdr_end; pdr_ptr += external_pdr_size) { + (*debug_swap->swap_pdr_in) (abfd, pdr_ptr, &pdr); if (offset >= (pdr.adr - 0x10 * pdr.prof)) { dist = offset - (pdr.adr - 0x10 * pdr.prof);