pool/dwarves
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 835930 from devel:tools

Browse Source 
- Backport fixes for segfault when processing dwz-ed kernel
  [bsc#1176095,https://github.com/acmel/dwarves/issues/10].
  * dwarves-dwarf_loader-Bail-out-at-DW_TAG_imported_unit-tags.patch
  * dwarves-dwarf_loader-Ignore-entries-in-a-DW_TAG_partial_unit-for-now.patch

OBS-URL: https://build.opensuse.org/request/show/835930
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dwarves?expand=0&rev=22
This commit is contained in:
Dominique Leuenberger 2020-09-25 14:23:54 +00:00 committed by Git OBS Bridge
commit 40b85b86ce
4 changed files with 91 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dwarves-dwarf_loader-Bail-out-at-DW_TAG_imported_unit-tags.patch Normal file
View File

@ -0,0 +1,37 @@
From 2ecc308518edfe059f34fd1ad69ef39ad011cab9 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri, 18 Sep 2020 16:56:13 -0300
Subject: [PATCH] dwarf_loader: Bail out at DW_TAG_imported_unit tags
We need to support these in a future version, for now, just bail out to
avoid segfaults afterwards.
$ pahole examples/sles/vmlinux-5.3.18-109.g8ff6392-default.debug
WARNING: DW_TAG_partial_unit used, some types will not be considered!
Probably this was optimized using a tool like 'dwz'
A future version of pahole will take support this.
$
Reported-by: Tom de Vries
Bugtracker: https://github.com/acmel/dwarves/issues/10
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
dwarf_loader.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dwarf_loader.c b/dwarf_loader.c
index 74e0227..fd058aa 100644
--- a/dwarf_loader.c
+++ b/dwarf_loader.c
@@ -1615,6 +1615,8 @@ static struct tag *__die__process_tag(Dwarf_Die *die, struct cu *cu,
struct tag *tag;
switch (dwarf_tag(die)) {
+ case DW_TAG_imported_unit:
+ return NULL; // We don't support imported units yet, so to avoid segfaults
case DW_TAG_array_type:
tag = die__create_new_array(die, cu); break;
case DW_TAG_base_type:
--
2.28.0

44
dwarves-dwarf_loader-Ignore-entries-in-a-DW_TAG_partial_unit-for-now.patch Normal file
View File

@ -0,0 +1,44 @@
From 8c92fd298101171dc8479acf4af2fdd2fad88c28 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri, 18 Sep 2020 13:53:01 -0300
Subject: [PATCH] dwarf_loader: Ignore entries in a DW_TAG_partial_unit, for
now
We will have to keep all CUs in memory and do lookups in imported units,
for now, just don't segfault.
Reported-by: Tom de Vries
Bugtracker: https://github.com/acmel/dwarves/issues/10
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
dwarf_loader.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/dwarf_loader.c b/dwarf_loader.c
index b8d7b35..74e0227 100644
--- a/dwarf_loader.c
+++ b/dwarf_loader.c
@@ -2085,7 +2085,19 @@ static int die__process(Dwarf_Die *die, struct cu *cu)
Dwarf_Die child;
const uint16_t tag = dwarf_tag(die);
- if (tag != DW_TAG_compile_unit && tag != DW_TAG_type_unit && tag != DW_TAG_partial_unit) {
+ if (tag == DW_TAG_partial_unit) {
+ static bool warned;
+
+ if (!warned) {
+ fprintf(stderr, "WARNING: DW_TAG_partial_unit used, some types will not be considered!\n"
+ " Probably this was optimized using a tool like 'dwz'\n"
+ " A future version of pahole will take support this.\n");
+ warned = true;
+ }
+ return 0; // so that other units can be processed
+ }
+
+ if (tag != DW_TAG_compile_unit && tag != DW_TAG_type_unit) {
fprintf(stderr, "%s: DW_TAG_compile_unit, DW_TAG_type_unit or DW_TAG_partial_unit expected got %s!\n",
__FUNCTION__, dwarf_tag_name(tag));
return -EINVAL;
--
2.28.0

8
dwarves.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Sep 21 18:48:25 UTC 2020 - Tom de Vries <tdevries@suse.com>
- Backport fixes for segfault when processing dwz-ed kernel
[bsc#1176095,https://github.com/acmel/dwarves/issues/10].
* dwarves-dwarf_loader-Bail-out-at-DW_TAG_imported_unit-tags.patch
* dwarves-dwarf_loader-Ignore-entries-in-a-DW_TAG_partial_unit-for-now.patch
-------------------------------------------------------------------
Wed Sep 2 08:39:24 UTC 2020 - Jiri Slaby <jslaby@suse.com>

2
dwarves.spec
View File

@ -29,6 +29,8 @@ Source: https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.xz
Source2: https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.sign
Source9: baselibs.conf
Patch0: libbpf-Fix-libbpf-hashmap-on-I-LP32-architectures.patch
Patch1: dwarves-dwarf_loader-Ignore-entries-in-a-DW_TAG_partial_unit-for-now.patch
Patch2: dwarves-dwarf_loader-Bail-out-at-DW_TAG_imported_unit-tags.patch
BuildRequires: cmake
BuildRequires: libdw-devel >= 0.170
%if 0%{?suse_version} < 1550