diff --git a/6a2b27c0f512619b0e7a769a18a0fb05bb3789a5.patch b/6a2b27c0f512619b0e7a769a18a0fb05bb3789a5.patch new file mode 100644 index 0000000000000000000000000000000000000000..ab740729ac6b688ecb5e31220ae0e76b73076219 --- /dev/null +++ b/6a2b27c0f512619b0e7a769a18a0fb05bb3789a5.patch @@ -0,0 +1,83 @@ +From 6a2b27c0f512619b0e7a769a18a0fb05bb3789a5 Mon Sep 17 00:00:00 2001 +From: Arnaldo Carvalho de Melo +Date: Tue, 18 Jun 2024 10:37:30 -0300 +Subject: [PATCH] core: Initialize cu->node with INIT_LIST_HEAD() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In cu__new() zalloc() is used defensively, and that helped catch this +problem where we assume that a cu us in the cus list of cu instances, +but that is not the case when we use cus__merge_and_process_cu(), for +instance when loading files created by clang with LTO, as reported by +Peter Jung and narrowed down by Nathan Chancellor. + +If we use INIT_LIST_HEAD() in cu__new() to initialize cu->node, which is +what we do with other lists and nodes there, then the unconditional +removal using list_del_init() will be a no-op and removing something not +on the cus list of cu instances will not cause problems, just keep an +unconsistent cus->nr_entries field. + +So lets just have this fix in first, keeping Nathan's Tested-by and then +do the a bit more involved fix of either adding that cu to the cus list +or checking at removal time if it is there. + + Program received signal SIGSEGV, Segmentation fault. + 0x00007ffff7f1e13e in __list_del (prev=0x0, next=0x0) at /home/acme/git/pahole/list.h:106 + 106 next->prev = prev; + (gdb) bt + #0 0x00007ffff7f1e13e in __list_del (prev=0x0, next=0x0) at /home/acme/git/pahole/list.h:106 + #1 0x00007ffff7f1e176 in list_del_init (entry=0x417980) at /home/acme/git/pahole/list.h:165 + #2 0x00007ffff7f1f8f9 in __cus__remove (cus=0x4142a0, cu=0x417980) at /home/acme/git/pahole/dwarves.c:527 + #3 0x00007ffff7f1f92b in cus__remove (cus=0x4142a0, cu=0x417980) at /home/acme/git/pahole/dwarves.c:533 + #4 0x00007ffff7f3d01c in cus__finalize (cus=0x4142a0, cu=0x417980, conf=0x4133c0 , thr_data=0x0) + at /home/acme/git/pahole/dwarf_loader.c:3040 + #5 0x00007ffff7f3e05c in cus__merge_and_process_cu (cus=0x4142a0, conf=0x4133c0 , mod=0x415cf0, dw=0x416110, elf=0x414380, + filename=0x7fffffffe3f7 "cast_common.ko", build_id=0x416680 "\265D\371U\213\373u|\037\250\242\032\271\365⒜]y\023", build_id_len=20, + type_dcu=0x0) at /home/acme/git/pahole/dwarf_loader.c:3482 + #6 0x00007ffff7f3e218 in cus__load_module (cus=0x4142a0, conf=0x4133c0 , mod=0x415cf0, dw=0x416110, elf=0x414380, + filename=0x7fffffffe3f7 "cast_common.ko") at /home/acme/git/pahole/dwarf_loader.c:3521 + #7 0x00007ffff7f3e396 in cus__process_dwflmod (dwflmod=0x415cf0, userdata=0x415d00, name=0x415ea0 "cast_common.ko", base=65536, + arg=0x7fffffffde40) at /home/acme/git/pahole/dwarf_loader.c:3581 + #8 0x00007ffff7eb4609 in dwfl_getmodules (dwfl=0x414300, callback=0x7ffff7f3e2ec , arg=0x7fffffffde40, offset=0) + at ../libdwfl/dwfl_getmodules.c:86 + #9 0x00007ffff7f3e4c5 in cus__process_file (cus=0x4142a0, conf=0x4133c0 , fd=3, filename=0x7fffffffe3f7 "cast_common.ko") + at /home/acme/git/pahole/dwarf_loader.c:3647 + #10 0x00007ffff7f3e5cd in dwarf__load_file (cus=0x4142a0, conf=0x4133c0 , filename=0x7fffffffe3f7 "cast_common.ko") + at /home/acme/git/pahole/dwarf_loader.c:3684 + #11 0x00007ffff7f232df in cus__load_file (cus=0x4142a0, conf=0x4133c0 , filename=0x7fffffffe3f7 "cast_common.ko") + at /home/acme/git/pahole/dwarves.c:2134 + #12 0x00007ffff7f23e8b in cus__load_files (cus=0x4142a0, conf=0x4133c0 , filenames=0x7fffffffe0f0) + at /home/acme/git/pahole/dwarves.c:2637 + #13 0x000000000040aec0 in main (argc=2, argv=0x7fffffffe0e8) at /home/acme/git/pahole/pahole.c:3805 + (gdb) fr 1 + #1 0x00007ffff7f1e176 in list_del_init (entry=0x417980) at /home/acme/git/pahole/list.h:165 + 165 __list_del(entry->prev, entry->next); + (gdb) p entry + $1 = (struct list_head *) 0x417980 + (gdb) p entry->next + $2 = (struct list_head *) 0x0 + (gdb) p entry->prev + $3 = (struct list_head *) 0x0 + +Closes: https://github.com/acmel/dwarves/issues/53 +Closes: https://gitlab.archlinux.org/archlinux/packaging/packages/pahole/-/issues/1 +Tested-by: Nathan Chancellor +Link: https://lore.kernel.org/all/20240617210810.GA1877676@thelio-3990X +Signed-off-by: Arnaldo Carvalho de Melo +--- + dwarves.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dwarves.c b/dwarves.c +index 1ec259f5..823a0152 100644 +--- a/dwarves.c ++++ b/dwarves.c +@@ -739,6 +739,7 @@ struct cu *cu__new(const char *name, uint8_t addr_size, + cu->dfops = NULL; + INIT_LIST_HEAD(&cu->tags); + INIT_LIST_HEAD(&cu->tool_list); ++ INIT_LIST_HEAD(&cu->node); + + cu->addr_size = addr_size; + cu->extra_dbg_info = 0; diff --git a/94a01bde592c555b3eb526aeb4c2ad695c5660d8.patch b/94a01bde592c555b3eb526aeb4c2ad695c5660d8.patch new file mode 100644 index 0000000000000000000000000000000000000000..83bb54428229c020507a590956d1f6aba3c91d88 --- /dev/null +++ b/94a01bde592c555b3eb526aeb4c2ad695c5660d8.patch @@ -0,0 +1,46 @@ +From 94a01bde592c555b3eb526aeb4c2ad695c5660d8 Mon Sep 17 00:00:00 2001 +From: Arnaldo Carvalho de Melo +Date: Tue, 18 Jun 2024 11:14:09 -0300 +Subject: [PATCH] dwarf_loader: Add missing cus__add(cus, cu) to + cus__merge_and_process_cu() + +In cus__finalize() if cu__finalize() returns LSK__DELETE, i.e. if the +tool processing the cu is done with it, we will assume that it is in the +cus list of cu instances, remove it and then delete it. + +This was not being done by cus__merge_and_process_cu(), used when +merging all DWARF CUs into a single 'struct cu', such as when processing +binaries generated by clang using LTO. + +Add the missing cus__add() to keep cus->nr_entries consistent. + +Cc: Alan Maguire +Cc: Daniel Xu +Cc: Domenico Andreoli +Cc: Dominique Leuenberger +Cc: Eduard Zingerman +Cc: Jan Alexander Steffens +Cc: Jan Engelhardt +Cc: Jiri Olsa +Cc: Matthias Schwarzott +Cc: Nathan Chancellor +Cc: Viktor Malik +Cc: Yonghong Song +Link: https://lore.kernel.org/all/ZnGZ71a4E29kPrvS@x1 +Signed-off-by: Arnaldo Carvalho de Melo +--- + dwarf_loader.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dwarf_loader.c b/dwarf_loader.c +index b832c93c..3caf3245 100644 +--- a/dwarf_loader.c ++++ b/dwarf_loader.c +@@ -3452,6 +3452,7 @@ static int cus__merge_and_process_cu(struct cus *cus, struct conf_load *conf, + cu->priv = dcu; + cu->dfops = &dwarf__ops; + cu->language = attr_numeric(cu_die, DW_AT_language); ++ cus__add(cus, cu); + } + + Dwarf_Die child; diff --git a/dwarves-1.26.tar.xz b/dwarves-1.26.tar.xz deleted file mode 100644 index 9acd9d9109c74cf2b6943db9e5f81b926a113656..0000000000000000000000000000000000000000 Binary files a/dwarves-1.26.tar.xz and /dev/null differ diff --git a/dwarves.spec b/dwarves.spec index a487fb621f68474ce1df13ef23dcbfd4c60832a3..cdd3500499110d6bb3b189c2709a7c8c84e4e930 100644 --- a/dwarves.spec +++ b/dwarves.spec @@ -3,17 +3,22 @@ %define libver 1 Name: dwarves -Version: 1.26 +Version: 1.27 Release: %{anolis_release}%{?dist} -License: GPLv2 +License: GPL-2.0-only Summary: Debugging Information Manipulation Tools (pahole & friends) -URL: https://github.com/acmel/dwarves -Source0: https://fedorapeople.org/~acme/dwarves/%{name}-%{version}.tar.xz -Requires: %{libname} = %{version}-%{release} +URL: http://acmel.wordpress.com +Source0: https://github.com/acmel/dwarves/archive/refs/tags/v%{version}.tar.gz +# core: Initialize cu->node with INIT_LIST_HEAD() +Patch: https://github.com/acmel/dwarves/commit/6a2b27c0f512619b0e7a769a18a0fb05bb3789a5.patch +# dwarf_loader: Add missing cus__add(cus, cu) to cus__merge_and_process_cu() +Patch: https://github.com/acmel/dwarves/commit/94a01bde592c555b3eb526aeb4c2ad695c5660d8.patch +Requires: %{libname}%{libver} = %{version}-%{release} BuildRequires: gcc BuildRequires: cmake >= 2.8.12 BuildRequires: zlib-devel BuildRequires: elfutils-devel >= 0.130 +Provides: pahole %description dwarves is a set of tools that use the debugging information inserted in @@ -51,19 +56,17 @@ it can be used to further format a number of records. The btfdiff utility compares the output of pahole from BTF and DWARF to make sure they produce the same results. -%package -n %{libname} +%package -n %{libname}%{libver} Summary: Debugging information processing library -Provides: %{libname}%{libver} = %{version}-%{release} -%description -n %{libname} +%description -n %{libname}%{libver} Debugging information processing library. -%package -n %{libname}-devel +%package -n %{libname}%{libver}-devel Summary: Debugging information library development files -Requires: %{libname} = %{version}-%{release} -Provides: %{libname}%{libver}-devel = %{version}-%{release} +Requires: %{libname}%{libver} = %{version}-%{release} -%description -n %{libname}-devel +%description -n %{libname}%{libver}-devel Debugging information processing library development files. %package doc @@ -75,15 +78,17 @@ BuildArch: noarch Doc files for dwarves %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -p1 %build %cmake -DCMAKE_BUILD_TYPE=Release . %cmake_build %install +rm -Rf %{buildroot} %cmake_install +%ldconfig_scriptlets -n %{libname}%{libver} %generate_compatibility_deps %files @@ -121,7 +126,7 @@ Doc files for dwarves %{abidir}/scncopy-option.list %{abidir}/syscse-option.list -%files -n %{libname} +%files -n %{libname}%{libver} %dir %{abidir} %{_libdir}/%{libname}.so.* %{_libdir}/%{libname}_emit.so.* @@ -130,7 +135,8 @@ Doc files for dwarves %{abidir}/libdwarves_emit.dump %{abidir}/libdwarves_reorganize.dump -%files -n %{libname}-devel + +%files -n %{libname}%{libver}-devel %doc MANIFEST README %{_includedir}/dwarves/btf_encoder.h %{_includedir}/dwarves/config.h @@ -157,6 +163,9 @@ Doc files for dwarves %doc NEWS %changelog +* Wed Feb 12 2025 Liwei Ge - 1.27-1 +- Refer to CentOS Stream dwarves-1.27-3 (tdawson@redhat.com) + * Thu Apr 11 2024 mgb01105731 - 1.26-1 - update to 1.26 diff --git a/v1.27.tar.gz b/v1.27.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..60b75bfd1a8feb1652f28bfda8857d54112cccd2 Binary files /dev/null and b/v1.27.tar.gz differ