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

Accepting request 766978 from devel:tools:compiler

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/766978
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dwz?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger 2020-02-03 10:10:32 +00:00 committed by Git OBS Bridge
commit d140019672
3 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
dwz-fix-segfault-in-die_cu.patch Normal file
View File

@ -0,0 +1,55 @@
Fix segfault in die_cu
[ Backport of master commit e2c440e. ]
When running dwz in normal mode, we get an error:
...
$ dwz clang-offload-bundler-10.debug -lnone
dwz: clang-offload-bundler-10.debug: Couldn't find DIE referenced by \
DW_OP_GNU_implicit_pointer
...
but when forcing low-mem mode, we get a segfault:
...
$ dwz clang-offload-bundler-10.debug -l0
Segmentation fault (core dumped)
...
In normal mode, we hit the error here:
...
ref = off_htab_lookup (NULL, addr);
if (ref == NULL)
{
error (0, 0, "%s: Couldn't find DIE referenced by %s",
dso->filename, get_DW_OP_str (op));
...
but for low-mem mode, this doesn't trigger, because we find the dummy DIE that
has been added by read_exprloc_low_mem_phase1.
Fix this by testing for the dummy DIE in the error condition:
...
- if (ref == NULL)
+ if (ref == NULL || (unlikely (low_mem) && ref->die_tag == 0))
...
2020-01-24 Tom de Vries <tdevries@suse.de>
PR dwz/25456
* dwz.c (read_exprloc): Test for dummy DIE in error condition.
---
dwz.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dwz.c b/dwz.c
index 298bca1..44b5ba3 100644
--- a/dwz.c
+++ b/dwz.c
@@ -1597,7 +1597,7 @@ read_exprloc (DSO *dso, dw_die_ref die, unsigned char *ptr, size_t len,
else
ptr += 4;
ref = off_htab_lookup (NULL, addr);
- if (ref == NULL)
+ if (ref == NULL || (unlikely (low_mem) && ref->die_tag == 0))
{
error (0, 0, "%s: Couldn't find DIE referenced by %s",
dso->filename, get_DW_OP_str (op));

6
dwz.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jan 24 17:08:55 UTC 2020 - Tom de Vries <tdevries@suse.com>
- Fix segfault in die_cu [swo#25456].
* dwz-fix-segfault-in-die_cu.patch
-------------------------------------------------------------------
Fri Jan 17 06:30:58 UTC 2020 - Tom de Vries <tdevries@suse.com>

2
dwz.spec
View File

@ -78,6 +78,7 @@ Patch2: dwz-fix-die-no-multifile-propagation.patch
Patch3: dwz-fix-assertion-off-cu_size-in-recompute_abbrevs.patch
Patch4: dwz-fix-refd-NULL-assertion-in-write_die.patch
Patch5: dwz-fix-reference-from-pu-to-cu.patch
Patch6: dwz-fix-segfault-in-die_cu.patch
%if %{build_main}
%description
@ -111,6 +112,7 @@ This package contains the testsuite results from DWZ.
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
make %{?_smp_mflags} CFLAGS="%{optflags}"