From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id 53E2D385843E for ; Wed, 9 Feb 2022 12:01:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 53E2D385843E Received: by mail-pf1-x435.google.com with SMTP id x15so1433795pfr.5 for ; Wed, 09 Feb 2022 04:01:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition; bh=+4VFzhYKlz2i233Lf+IifeyE9jzAS6EOY8kRjSSKnfs=; b=5fD0z737wSY+55Zl0I7hyXbaXYXMWkJiL0e1DI4cG1RknNGaMd2mGDAmP4geq3FNuM rsXNjI4MGVOm+K6Uog+TWs6IxHrNREakr5vv344CqMO6Kq9cxt3o4nFfvp652qYh6yWj 4oLn/+dou+b6uHzbO/eAN9rwpDiVqG/v38VLbff+ydMmaMaW/XNkQWNSqKxVJVYDEFFd lHjtutM987SKUF7N1elirtT33RQ+/tS3Z508IjQJeNAz1SPiW8vEPxKfUQ4FDxt1luHc YeJkaGUGL51pWK7bphRx35Iq1cfr8EXC+xQRuU0g31ez4orFM90tb7BIy8a1Uo5IAWpX HEmQ== X-Gm-Message-State: AOAM533O8Zwk4TedJEuQQAoVBMsapXV8neX2Y4LpZk7lCEQ7vdA4NS/J CO0xwV3U+b1SjBb6IX2HDtZzaWg+x7U= X-Google-Smtp-Source: ABdhPJxoky0WpXp2LeLJp91c9GT2Rt4Q+40nZSoyrZDzGY9UJh2Lyr+dBfQczGqDWpZUFwX7VcYiVA== X-Received: by 2002:a05:6a00:1892:: with SMTP id x18mr1957880pfh.20.1644408105937; Wed, 09 Feb 2022 04:01:45 -0800 (PST) Received: from squeak.grove.modra.org (158.106.96.58.static.exetel.com.au. [58.96.106.158]) by smtp.gmail.com with ESMTPSA id oc17sm6517307pjb.12.2022.02.09.04.01.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 04:01:45 -0800 (PST) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 932CC1140296; Wed, 9 Feb 2022 22:31:42 +1030 (ACDT) Date: Wed, 9 Feb 2022 22:31:42 +1030 From: Alan Modra To: binutils@sourceware.org Subject: PR28763, SIGSEGV during processing of program headers via readelf Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3037.9 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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Wed, 09 Feb 2022 12:01:49 -0000 PR 28763 * readelf.c (process_file_header): Discard any cached program headers if there is an extension field for e_phnum in first section header. diff --git a/binutils/readelf.c b/binutils/readelf.c index e56e9b56393..b208db59334 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -5631,10 +5631,7 @@ process_file_header (Filedata * filedata) if (filedata->section_headers != NULL && header->e_phnum == PN_XNUM && filedata->section_headers[0].sh_info != 0) - { - header->e_phnum = filedata->section_headers[0].sh_info; - printf (" (%u)", header->e_phnum); - } + printf (" (%u)", filedata->section_headers[0].sh_info); putc ('\n', stdout); printf (_(" Size of section headers: %u (bytes)\n"), header->e_shentsize); @@ -5667,7 +5664,12 @@ process_file_header (Filedata * filedata) { if (header->e_phnum == PN_XNUM && filedata->section_headers[0].sh_info != 0) - header->e_phnum = filedata->section_headers[0].sh_info; + { + /* Throw away any cached read of PN_XNUM headers. */ + free (filedata->program_headers); + filedata->program_headers = NULL; + header->e_phnum = filedata->section_headers[0].sh_info; + } if (header->e_shnum == SHN_UNDEF) header->e_shnum = filedata->section_headers[0].sh_size; if (header->e_shstrndx == (SHN_XINDEX & 0xffff)) -- Alan Modra Australia Development Lab, IBM