diff --git a/.gitignore b/.gitignore index 8b9478c..35d45b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -elfutils-0.193.tar.bz2 +elfutils-0.194.tar.bz2 diff --git a/elfutils-0.194-alloc-jobs.patch b/elfutils-0.194-alloc-jobs.patch new file mode 100644 index 0000000..cabf590 --- /dev/null +++ b/elfutils-0.194-alloc-jobs.patch @@ -0,0 +1,135 @@ +From f66135f16fe44182a3fc5b651d7e5071c936217d Mon Sep 17 00:00:00 2001 +From: Aaron Merey +Date: Mon, 27 Oct 2025 22:00:12 -0400 +Subject: [PATCH] readelf: Allocate job_data one-by-one as needed + +Currently, job_data is stored in an array whose size is equal to the +number of debug sections (.debug_*, .eh_frame, .gdb_index, etc.). + +This size may be too small if a binary contains multiple debug sections +with the same name. For example an ET_REL binary compiled with -ggdb3 +can contain multiple .debug_macro sections. + +Fix this by allocating job_data on the fly when preparing to read a +debug section. This supports an arbitrary number of debug sections +while also avoiding unnecessary memory allocation. + +https://sourceware.org/bugzilla/show_bug.cgi?id=33580 + +Signed-off-by: Aaron Merey +--- + src/readelf.c | 49 +++++++++++++++++++++++++------------------------ + 1 file changed, 25 insertions(+), 24 deletions(-) + +diff --git a/src/readelf.c b/src/readelf.c +index ee6c203d..a2d17358 100644 +--- a/src/readelf.c ++++ b/src/readelf.c +@@ -12200,7 +12200,8 @@ getone_dwflmod (Dwfl_Module *dwflmod, + return DWARF_CB_OK; + } + +-typedef struct { ++typedef struct Job_Data { ++ struct Job_Data *next; + Dwfl_Module *dwflmod; + Ebl *ebl; + GElf_Ehdr *ehdr; +@@ -12230,7 +12231,7 @@ do_job (void *data, FILE *out) + If thread safety is not supported or the maximum number of threads is set + to 1, then immediately call START_ROUTINE with the given arguments. */ + static void +-schedule_job (job_data jdata[], size_t idx, ++schedule_job (job_data **jdatalist, + void (*start_routine) (Dwfl_Module *, Ebl *, GElf_Ehdr *, + Elf_Scn *, GElf_Shdr *, Dwarf *, FILE *), + Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr, Elf_Scn *scn, +@@ -12239,21 +12240,24 @@ schedule_job (job_data jdata[], size_t idx, + #ifdef USE_LOCKS + if (max_threads > 1) + { +- /* Add to the job queue. */ +- jdata[idx].dwflmod = dwflmod; +- jdata[idx].ebl = ebl; +- jdata[idx].ehdr = ehdr; +- jdata[idx].scn = *scn; +- jdata[idx].shdr = *shdr; +- jdata[idx].dbg = dbg; +- jdata[idx].fp = start_routine; ++ job_data *jdata = xmalloc (sizeof (job_data)); ++ ++ jdata->dwflmod = dwflmod; ++ jdata->ebl = ebl; ++ jdata->ehdr = ehdr; ++ jdata->scn = *scn; ++ jdata->shdr = *shdr; ++ jdata->dbg = dbg; ++ jdata->fp = start_routine; ++ jdata->next = *jdatalist; ++ *jdatalist = jdata; + +- add_job (do_job, (void *) &jdata[idx]); ++ add_job (do_job, (void *) jdata); + } + else + start_routine (dwflmod, ebl, ehdr, scn, shdr, dbg, stdout); + #else +- (void) jdata; (void) idx; ++ (void) jdatalist; + + start_routine (dwflmod, ebl, ehdr, scn, shdr, dbg, stdout); + #endif +@@ -12431,8 +12435,7 @@ print_debug (Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr) + if (unlikely (elf_getshdrstrndx (ebl->elf, &shstrndx) < 0)) + error_exit (0, _("cannot get section header string table index")); + +- ssize_t num_jobs = 0; +- job_data *jdata = NULL; ++ job_data *jdatalist = NULL; + + /* If the .debug_info section is listed as implicitly required then + we must make sure to handle it before handling any other debug +@@ -12531,13 +12534,6 @@ print_debug (Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr) + if (name == NULL) + continue; + +- if (jdata == NULL) +- { +- jdata = calloc (ndebug_sections, sizeof (*jdata)); +- if (jdata == NULL) +- error_exit (0, _("failed to allocate job data")); +- } +- + int n; + for (n = 0; n < ndebug_sections; ++n) + { +@@ -12561,10 +12557,9 @@ print_debug (Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr) + { + if (((print_debug_sections | implicit_debug_sections) + & debug_sections[n].bitmask)) +- schedule_job (jdata, num_jobs++, debug_sections[n].fp, ++ schedule_job (&jdatalist, debug_sections[n].fp, + dwflmod, ebl, ehdr, scn, shdr, dbg); + +- assert (num_jobs <= ndebug_sections); + break; + } + } +@@ -12579,7 +12574,13 @@ print_debug (Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr) + + dwfl_end (skel_dwfl); + free (skel_name); +- free (jdata); ++ ++ while (jdatalist != NULL) ++ { ++ job_data *jdata = jdatalist; ++ jdatalist = jdatalist->next; ++ free (jdata); ++ } + + /* Turn implicit and/or explicit back on in case we go over another file. */ + if (implicit_info) +-- +2.51.0 + diff --git a/elfutils-0.194-zero-sh_addr.patch b/elfutils-0.194-zero-sh_addr.patch new file mode 100644 index 0000000..1e29e73 --- /dev/null +++ b/elfutils-0.194-zero-sh_addr.patch @@ -0,0 +1,263 @@ +From patchwork Tue Mar 3 12:16:07 2026 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Mark Wielaard +X-Patchwork-Id: 131004 +Return-Path: +X-Original-To: patchwork@sourceware.org +Delivered-To: patchwork@sourceware.org +Received: from vm01.sourceware.org (localhost [127.0.0.1]) + by sourceware.org (Postfix) with ESMTP id 369014BA2E1B + for ; Tue, 3 Mar 2026 12:16:50 +0000 (GMT) +DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 369014BA2E1B +X-Original-To: elfutils-devel@sourceware.org +Delivered-To: elfutils-devel@sourceware.org +Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) + by sourceware.org (Postfix) with ESMTPS id 809094BA2E1B + for ; Tue, 3 Mar 2026 12:16:35 +0000 (GMT) +DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 809094BA2E1B +Authentication-Results: sourceware.org; + dmarc=none (p=none dis=none) header.from=klomp.org +Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org +ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 809094BA2E1B +Authentication-Results: server2.sourceware.org; + arc=none smtp.remote-ip=45.83.234.184 +ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1772540195; cv=none; + b=LJ/IzDwxbRLuqzKPqQreoP4BmOCMDubRw8tN8tIttGvEfT+PvTQNJfR9jz3tNSLBRr0Bzzm11z6IfY47B3dDF7bNSfwCCL+X9D6FpgY9o/4PWBfbic6aRKwjP1NzB1CWVK3+RldaU1Tg/uwkhJjVdlFlSQMx3J0MdWiPRZ7QugI= +ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; + t=1772540195; c=relaxed/simple; + bh=Vr8QdX5vENUe1WatH2mBquvCd/VGC5H6fjMAeCETkWU=; + h=From:To:Subject:Date:Message-ID:MIME-Version; + b=Ulpd7RO550MP6x/VDwwJcwQ46BiqzGLUI7YPswxKxudHW3LasYvXxZfVdNaRiP6oLX4gbg0gXoPHrSFEkTig7ko9J3z2rzwQdk9NBaRYhIBhG8KhTbtdvsHPO+k8rWi26AX1T5yo47Nhpu8ubPf/q/a/1A73o5b/GzDKDT03vQA= +ARC-Authentication-Results: i=1; server2.sourceware.org +DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 809094BA2E1B +Received: from 9950x.localdomain (82-217-174-174.cable.dynamic.v4.ziggo.nl + [82.217.174.174]) + (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) + (No client certificate requested) + by gnu.wildebeest.org (Postfix) with ESMTPSA id 033ED3032F85; + Tue, 3 Mar 2026 13:16:33 +0100 (CET) +Received: by 9950x.localdomain (Postfix, from userid 1000) + id 525BDAA0035; Tue, 03 Mar 2026 13:16:32 +0100 (CET) +From: Mark Wielaard +To: elfutils-devel@sourceware.org +Cc: Mark Wielaard +Subject: [PATCH] libdwfl: Work around ET_REL files with sh_addr fields set to + non-zero +Date: Tue, 3 Mar 2026 13:16:07 +0100 +Message-ID: <20260303121607.639207-1-mark@klomp.org> +X-Mailer: git-send-email 2.53.0 +MIME-Version: 1.0 +X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, + JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, + RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED, + RCVD_IN_VALIDITY_SAFE_BLOCKED, 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 sourceware.org +X-BeenThere: elfutils-devel@sourceware.org +X-Mailman-Version: 2.1.30 +Precedence: list +List-Id: Elfutils-devel mailing list +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Errors-To: elfutils-devel-bounces~patchwork=sourceware.org@sourceware.org + +libdwfl tries to model the loading of modules (executables, shared +libraries, the linux kernel and/or kernel modules) in +memory. Depending on the (offline) load address it then also applies +(simple) relocations for ET_REL (object files or kernel modules). Load +addresses are normally represented through phdr segments for ET_EXEC +or ET_DYN, but for ET_REL files (which don't have phdrs) the Elf +section sh_addr fields are used. + +The sh_addr fields of the ET_REL Elf images are updated in two places +__libdwfl_elf_address_range (through __libdwfl_report_elf) and +__libdwfl_relocate (through dwfl_module_getelf and +dwfl_module_getdwarf). Both rely on sh_addr being zero if no load +address has been set yet, so the address layout for each (SHF_ALLOC) +section is done only once. + +Recent linux kernels use a linker script that does set the sh_addr +fields to (random, linker assigned) non-zero addresses. See commit +1ba9f8979426 ("vmlinux.lds: Unify TEXT_MAIN, DATA_MAIN, and related +macros"). + +The sh_addr values seems unnecessary, but because they aren't zero +anymore our layout/relocation code doesn't know it still has to figure +out a "real" load value for these sections. + +Introduce __libdwfl_reset_sh_addr which resets all sh_addr fields to +zero for SHF_ALLOC sections in ET_REL files. + +We don't call __libdwfl_reset_sh_addr on aux_sym files (from +.gnu_debugdata) and when constructing an Elf from a core file. In all +other cases we know (or assume) that the Elf file is being opened +through libdw_open_elf (called indirectly through __libdw_open_elf, +__libdwfl_report_offline, dwfl_module_getelf and dwfl_module_getdwarf) + +This technically changes the Elf that goes through libdwfl, but we +would already update the sh_addr fields for ET_REL Elf sections in +memory anyway to represent the load address as libdwfl would see +them. So this isn't really a change in behavior (it just might update +the sh_addr field twice). + + * libdwfl/libdwflP.h (__libdwfl_reset_sh_addr): Define new + internal function. + * libdwfl/relocate.c (__libdwfl_reset_sh_addr): New internal + function. + * libdwfl/open.c (libdw_open_elf): Call __libdwfl_reset_sh_addr. + * libdwfl/dwfl_module_getdwarf.c (open_elf_file): Add comment. + (find_aux_sym): Likewise. + (find_dw): Likewise. + * libdwfl/dwfl_segment_report_module.c + (dwfl_segment_report_module): Likewise. + * libdwfl/dwfl_report_elf.c (__libdwfl_report_elf): Likewise. + +Signed-off-by: Mark Wielaard +--- + libdwfl/dwfl_module_getdwarf.c | 3 +++ + libdwfl/dwfl_report_elf.c | 3 +++ + libdwfl/dwfl_segment_report_module.c | 2 ++ + libdwfl/libdwflP.h | 4 ++++ + libdwfl/open.c | 2 ++ + libdwfl/relocate.c | 32 ++++++++++++++++++++++++++++ + 6 files changed, 46 insertions(+) + +diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c +index 135132d69178..430c32367d01 100644 +--- a/libdwfl/dwfl_module_getdwarf.c ++++ b/libdwfl/dwfl_module_getdwarf.c +@@ -57,6 +57,7 @@ open_elf_file (Elf **elf, int *fd, char **name) + if (*fd < 0) + return CBFAIL; + ++ /* This will call __libdwfl_reset_sh_addr. */ + return __libdw_open_file (fd, elf, true, false); + } + else if (unlikely (elf_kind (*elf) != ELF_K_ELF)) +@@ -1004,6 +1005,7 @@ find_aux_sym (Dwfl_Module *mod __attribute__ ((unused)), + free (buffer); + else + { ++ /* We don't call __libdwfl_reset_sh_addr here, should we? */ + mod->aux_sym.elf = elf_memory (buffer, size); + if (mod->aux_sym.elf == NULL) + free (buffer); +@@ -1423,6 +1425,7 @@ find_dw (Dwfl_Module *mod) + switch (mod->dwerr) + { + case DWFL_E_NOERROR: ++ /* main.elf already should have had __libdwfl_reset_sh_addr called. */ + mod->debug.elf = mod->main.elf; + mod->debug.address_sync = mod->main.address_sync; + +diff --git a/libdwfl/dwfl_report_elf.c b/libdwfl/dwfl_report_elf.c +index a76d36816c6f..7173375127a8 100644 +--- a/libdwfl/dwfl_report_elf.c ++++ b/libdwfl/dwfl_report_elf.c +@@ -268,6 +268,9 @@ __libdwfl_report_elf (Dwfl *dwfl, const char *name, const char *file_name, + /* Preinstall the open ELF handle for the module. */ + if (m->main.elf == NULL) + { ++ /* We assume all calls to __libdwfl_report_elf got their Elf ++ through __libdw_open_file which already called ++ __libdwfl_reset_sh_addr. */ + m->main.elf = elf; + m->main.vaddr = vaddr; + m->main.address_sync = address_sync; +diff --git a/libdwfl/dwfl_segment_report_module.c b/libdwfl/dwfl_segment_report_module.c +index f2f866c2c70f..5ad318c78b09 100644 +--- a/libdwfl/dwfl_segment_report_module.c ++++ b/libdwfl/dwfl_segment_report_module.c +@@ -1072,6 +1072,8 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name, + elf->flags |= ELF_F_MALLOCED; + } + ++ /* Elf comes through a core file, so cannot be an ET_REL. Don't call ++ __libdwfl_reset_sh_addr. */ + if (elf != NULL && mod->main.elf == NULL) + { + /* Install the file in the module. */ +diff --git a/libdwfl/libdwflP.h b/libdwfl/libdwflP.h +index 6e394c262010..7a181029c529 100644 +--- a/libdwfl/libdwflP.h ++++ b/libdwfl/libdwflP.h +@@ -482,6 +482,10 @@ extern void __libdwfl_module_free (Dwfl_Module *mod) internal_function; + /* Find the main ELF file, update MOD->elferr and/or MOD->main.elf. */ + extern void __libdwfl_getelf (Dwfl_Module *mod) internal_function; + ++/* Reset all sh_addr fields to zero for SHF_ALLOC sections if the Elf ++ handle is an ET_REL. Called from libdw_open_elf. */ ++extern void __libdwfl_reset_sh_addr (Elf *elf) internal_function; ++ + /* Process relocations in debugging sections in an ET_REL file. + FILE must be opened with ELF_C_READ_MMAP_PRIVATE or ELF_C_READ, + to make it possible to relocate the data in place (or ELF_C_RDWR or +diff --git a/libdwfl/open.c b/libdwfl/open.c +index e66595fba097..86a3540f2af3 100644 +--- a/libdwfl/open.c ++++ b/libdwfl/open.c +@@ -190,6 +190,8 @@ libdw_open_elf (int *fdp, Elf **elfp, bool close_on_fail, bool archive_ok, + *fdp = -1; + } + ++ __libdwfl_reset_sh_addr (elf); ++ + *elfp = elf; + return error; + } +diff --git a/libdwfl/relocate.c b/libdwfl/relocate.c +index 0497bd4fe1f3..dc9f45e64f3f 100644 +--- a/libdwfl/relocate.c ++++ b/libdwfl/relocate.c +@@ -1,5 +1,6 @@ + /* Relocate debug information. + Copyright (C) 2005-2011, 2014, 2016, 2018 Red Hat, Inc. ++ Copyright (C) 2026 Mark J. Wielaard + This file is part of elfutils. + + This file is free software; you can redistribute it and/or modify +@@ -37,6 +38,37 @@ + + typedef uint8_t GElf_Byte; + ++/* Reset all sh_addr fields to zero for SHF_ALLOC sections if the Elf ++ handle is an ET_REL. Called from libdw_open_elf. */ ++ ++void ++internal_function ++__libdwfl_reset_sh_addr (Elf *elf) ++{ ++ if (elf == NULL || elf->kind != ELF_K_ELF) ++ return; ++ ++ GElf_Ehdr ehdr_mem; ++ GElf_Ehdr *ehdr = gelf_getehdr (elf, &ehdr_mem); ++ if (ehdr == NULL || ehdr->e_type != ET_REL) ++ return; ++ ++ Elf_Scn *scn = NULL; ++ while ((scn = elf_nextscn (elf, scn)) != NULL) ++ { ++ GElf_Shdr shdr_mem; ++ GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem); ++ if (shdr != NULL) ++ { ++ if ((shdr->sh_flags & SHF_ALLOC) != 0 && shdr->sh_addr != 0) ++ { ++ shdr_mem.sh_addr = 0; ++ gelf_update_shdr (scn, &shdr_mem); ++ } ++ } ++ } ++} ++ + /* Adjust *VALUE to add the load address of the SHNDX section. + We update the section header in place to cache the result. */ + diff --git a/elfutils.spec b/elfutils.spec index 6cbc3b2..9d8d740 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -3,8 +3,8 @@ %bcond_with static Name: elfutils -Version: 0.193 -%global baserelease 1 +Version: 0.194 +%global baserelease 2 Release: %{baserelease}%{?dist} URL: http://elfutils.org/ %global source_url ftp://sourceware.org/pub/elfutils/%{version}/ @@ -96,6 +96,12 @@ BuildRequires: gettext-devel # For s390x... FDO package notes are bogus. Patch1: elfutils-0.186-fdo-swap.patch +# Prevent assert failure in readelf for some -ggdb3 binaries. +Patch2: elfutils-0.194-alloc-jobs.patch + +# Ensure sh_addr fields initialized to zero for ET_REL binaries. +Patch3: elfutils-0.194-zero-sh_addr.patch + %description Elfutils is a collection of utilities, including stack (to show backtraces), nm (for listing symbols from object files), size @@ -456,6 +462,7 @@ fi %{_mandir}/man3/elf_*.3* %{_mandir}/man3/elf32_*.3* %{_mandir}/man3/elf64_*.3* +%{_mandir}/man3/gelf_*.3* %{_mandir}/man3/libelf.3* %if %{with static} @@ -518,6 +525,13 @@ exit 0 %systemd_postun_with_restart debuginfod.service %changelog +* Thr Mar 5 2026 Aaron Merey - 0.194-2 +- Add elfutils-0.194-zero-sh_addr.patch + +* Thr Oct 30 2025 Aaron Merey - 0.194-1 +- Upgrade to upstream elfutils 0.194 +- Add elfutils-0.194-alloc-jobs.patch + * Wed Apr 30 2025 Aaron Merey - 0.193-1 - Upgrade to upstream elfutils 0.193 - Drop upstreamed patches diff --git a/sources b/sources index 7c1ca7e..bd25645 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (elfutils-0.193.tar.bz2) = 557e328e3de0d2a69d09c15a9333f705f3233584e2c6a7d3ce855d06a12dc129e69168d6be64082803630397bd64e1660a8b5324d4f162d17922e10ddb367d76 +SHA512 (elfutils-0.194.tar.bz2) = 5d00502f61b92643bf61dc61da4ddded36c423466388d992bcd388c5208761b8ed9db1a01492c085cd0984eef30c08f895a8e307e78e0df8df40b56ae35b78a5