From 19a8e4dbd8268b8f0add9803d80d0266eac1aaa9 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 21 Apr 2009 15:44:07 -0700 Subject: Fix derelocate crash for non-ET_REL file with some sh_addr at 0. --- libdwfl/ChangeLog | 9 +++++++++ libdwfl/derelocate.c | 5 +++-- libdwfl/dwfl_module_build_id.c | 5 +++-- libdwfl/dwfl_module_getsym.c | 30 +++++++++++++++--------------- libdwfl/relocate.c | 2 ++ tests/ChangeLog | 6 ++++++ tests/Makefile.am | 4 ++-- tests/run-addrname-test.sh | 1 + tests/run-dwfl-addr-sect.sh | 8 ++++++-- tests/testfile50.bz2 | Bin 0 -> 229 bytes 10 files changed, 47 insertions(+), 23 deletions(-) create mode 100644 tests/testfile50.bz2 diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index c2eb39d9..bc4344c3 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,12 @@ +2009-04-21 Roland McGrath + + * dwfl_module_getsym.c: Apply non-ET_REL bias only if SHF_ALLOC. + + * relocate.c (__libdwfl_relocate_value): Assert that MOD is ET_REL. + * derelocate.c (cache_sections): Call __libdwfl_relocate_value only + for ET_REL. + * dwfl_module_build_id.c (__libdwfl_find_build_id): Likewise. + 2009-04-20 Roland McGrath * dwfl_module_getdwarf.c (__libdwfl_getelf): Add internal_function. diff --git a/libdwfl/derelocate.c b/libdwfl/derelocate.c index f2a64675..c300f84b 100644 --- a/libdwfl/derelocate.c +++ b/libdwfl/derelocate.c @@ -1,5 +1,5 @@ /* Recover relocatibility for addresses computed from debug information. - Copyright (C) 2005, 2006, 2007, 2008 Red Hat, Inc. + Copyright (C) 2005-2009 Red Hat, Inc. This file is part of Red Hat elfutils. Red Hat elfutils is free software; you can redistribute it and/or modify @@ -110,7 +110,8 @@ cache_sections (Dwfl_Module *mod) if (shdr == NULL) goto elf_error; - if ((shdr->sh_flags & SHF_ALLOC) && shdr->sh_addr == 0) + if ((shdr->sh_flags & SHF_ALLOC) && shdr->sh_addr == 0 + && mod->e_type == ET_REL) { /* This section might not yet have been looked at. */ if (__libdwfl_relocate_value (mod, mod->main.elf, &shstrndx, diff --git a/libdwfl/dwfl_module_build_id.c b/libdwfl/dwfl_module_build_id.c index f3fcc190..a3797a5a 100644 --- a/libdwfl/dwfl_module_build_id.c +++ b/libdwfl/dwfl_module_build_id.c @@ -135,8 +135,9 @@ __libdwfl_find_build_id (Dwfl_Module *mod, bool set, Elf *elf) /* Determine the right sh_addr in this module. */ GElf_Addr vaddr = 0; if (!(shdr->sh_flags & SHF_ALLOC) - || __libdwfl_relocate_value (mod, elf, &shstrndx, - elf_ndxscn (scn), &vaddr)) + || (mod->e_type == ET_REL + && __libdwfl_relocate_value (mod, elf, &shstrndx, + elf_ndxscn (scn), &vaddr))) vaddr = NO_VADDR; result = check_notes (mod, set, elf_getdata (scn, NULL), vaddr); } diff --git a/libdwfl/dwfl_module_getsym.c b/libdwfl/dwfl_module_getsym.c index 816d2143..f78e6ec0 100644 --- a/libdwfl/dwfl_module_getsym.c +++ b/libdwfl/dwfl_module_getsym.c @@ -74,25 +74,25 @@ dwfl_module_getsym (Dwfl_Module *mod, int ndx, if (sym->st_shndx != SHN_XINDEX) shndx = sym->st_shndx; - if (shndxp != NULL) + /* Figure out whether this symbol points into an SHF_ALLOC section. */ + bool alloc = true; + if ((shndxp != NULL || mod->e_type != ET_REL) + && (sym->st_shndx == SHN_XINDEX + || (sym->st_shndx < SHN_LORESERVE && sym->st_shndx != SHN_UNDEF))) { - *shndxp = shndx; - - /* Yield -1 in case of a non-SHF_ALLOC section. */ - if (sym->st_shndx == SHN_XINDEX - || (sym->st_shndx < SHN_LORESERVE && sym->st_shndx != SHN_UNDEF)) - { - GElf_Shdr shdr_mem; - GElf_Shdr *shdr = gelf_getshdr (elf_getscn (mod->symfile->elf, shndx), - &shdr_mem); - if (unlikely (shdr == NULL) || !(shdr->sh_flags & SHF_ALLOC)) - *shndxp = (GElf_Word) -1; - } + GElf_Shdr shdr_mem; + GElf_Shdr *shdr = gelf_getshdr (elf_getscn (mod->symfile->elf, shndx), + &shdr_mem); + alloc = unlikely (shdr == NULL) || (shdr->sh_flags & SHF_ALLOC); } + if (shndxp != NULL) + /* Yield -1 in case of a non-SHF_ALLOC section. */ + *shndxp = alloc ? shndx : (GElf_Word) -1; + switch (sym->st_shndx) { - case SHN_ABS: + case SHN_ABS: /* XXX sometimes should use bias?? */ case SHN_UNDEF: case SHN_COMMON: break; @@ -112,7 +112,7 @@ dwfl_module_getsym (Dwfl_Module *mod, int ndx, return NULL; } } - else + else if (alloc) /* Apply the bias to the symbol value. */ sym->st_value += mod->symfile->bias; break; diff --git a/libdwfl/relocate.c b/libdwfl/relocate.c index e809a979..b236ca50 100644 --- a/libdwfl/relocate.c +++ b/libdwfl/relocate.c @@ -59,6 +59,8 @@ internal_function __libdwfl_relocate_value (Dwfl_Module *mod, Elf *elf, size_t *shstrndx, Elf32_Word shndx, GElf_Addr *value) { + assert (mod->e_type == ET_REL); + Elf_Scn *refscn = elf_getscn (elf, shndx); GElf_Shdr refshdr_mem, *refshdr = gelf_getshdr (refscn, &refshdr_mem); if (refshdr == NULL) diff --git a/tests/ChangeLog b/tests/ChangeLog index 25f271f1..70e9c027 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,9 @@ +2009-04-21 Roland McGrath + + * testfile50.bz2: New data file. + * Makefile.am (EXTRA_DIST): Add it. + * run-dwfl-addr-sect.sh: Add a case using it. + 2008-12-31 Ulrich Drepper * testfile44.S.bz2: Add tests for dppd, dpps, insertps, movntdqa, diff --git a/tests/Makefile.am b/tests/Makefile.am index b533521c..81c1ab76 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in ## -## Copyright (C) 1996-2002, 2003, 2004, 2005, 2006, 2007, 2008 Red Hat, Inc. +## Copyright (C) 1996-2009 Red Hat, Inc. ## This file is part of Red Hat elfutils. ## ## Red Hat elfutils is free software; you can redistribute it and/or modify @@ -141,7 +141,7 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh \ testfile44.S.bz2 testfile44.expect.bz2 run-disasm-x86.sh \ testfile45.S.bz2 testfile45.expect.bz2 run-disasm-x86-64.sh \ testfile46.bz2 testfile47.bz2 testfile48.bz2 testfile48.debug.bz2 \ - testfile49.bz2 + testfile49.bz2 testfile50.bz2 installed_TESTS_ENVIRONMENT = libdir=$(DESTDIR)$(libdir) \ bindir=$(DESTDIR)$(bindir) \ diff --git a/tests/run-addrname-test.sh b/tests/run-addrname-test.sh index d525523d..2a188915 100755 --- a/tests/run-addrname-test.sh +++ b/tests/run-addrname-test.sh @@ -64,6 +64,7 @@ EOF testfiles testfile12 testfile14 tempfiles testmaps +remove_files= cat > testmaps < module "" section 4 + 0 @@ -33,4 +33,8 @@ address 0x8 => module "" section 1 + 0x8 address 0x98 => module "" section 7 + 0 EOF +testrun_compare ./dwfl-addr-sect -e testfile50 0x1 <<\EOF +address 0x1 => module "" section 1 + 0x1 +EOF + exit 0 diff --git a/tests/testfile50.bz2 b/tests/testfile50.bz2 new file mode 100644 index 00000000..fce43321 Binary files /dev/null and b/tests/testfile50.bz2 differ -- cgit v1.2.1 From cc480475458dabde78051d697ec38af6813f131b Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 22 Apr 2009 11:32:20 -0700 Subject: Fix dwfl_module_build_id regression in last change. --- libdwfl/ChangeLog | 5 +++++ libdwfl/dwfl_module_build_id.c | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index bc4344c3..86a08e93 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,8 @@ +2009-04-22 Roland McGrath + + * dwfl_module_build_id.c (__libdwfl_find_build_id): Fix last change to + adjust properly for non-ET_REL. + 2009-04-21 Roland McGrath * dwfl_module_getsym.c: Apply non-ET_REL bias only if SHF_ALLOC. diff --git a/libdwfl/dwfl_module_build_id.c b/libdwfl/dwfl_module_build_id.c index a3797a5a..e1256db7 100644 --- a/libdwfl/dwfl_module_build_id.c +++ b/libdwfl/dwfl_module_build_id.c @@ -134,10 +134,12 @@ __libdwfl_find_build_id (Dwfl_Module *mod, bool set, Elf *elf) { /* Determine the right sh_addr in this module. */ GElf_Addr vaddr = 0; - if (!(shdr->sh_flags & SHF_ALLOC) - || (mod->e_type == ET_REL - && __libdwfl_relocate_value (mod, elf, &shstrndx, - elf_ndxscn (scn), &vaddr))) + if (!(shdr->sh_flags & SHF_ALLOC)) + vaddr = NO_VADDR; + else if (mod->e_type != ET_REL) + vaddr = shdr->sh_addr + mod->main.bias; + else if (__libdwfl_relocate_value (mod, elf, &shstrndx, + elf_ndxscn (scn), &vaddr)) vaddr = NO_VADDR; result = check_notes (mod, set, elf_getdata (scn, NULL), vaddr); } -- cgit v1.2.1 From c65558baa0382d59398234c5a05debdc5a98eb1b Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 22 Apr 2009 12:29:32 -0700 Subject: Fix relocation when symbols are resolved in non-ET_REL modules. --- libdwfl/ChangeLog | 3 +++ libdwfl/relocate.c | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index 86a08e93..f0b0a284 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,5 +1,8 @@ 2009-04-22 Roland McGrath + * relocate.c (resolve_symbol): Apply correct bias to st_value found in + a non-ET_REL module. + * dwfl_module_build_id.c (__libdwfl_find_build_id): Fix last change to adjust properly for non-ET_REL. diff --git a/libdwfl/relocate.c b/libdwfl/relocate.c index b236ca50..2c0f3010 100644 --- a/libdwfl/relocate.c +++ b/libdwfl/relocate.c @@ -267,9 +267,15 @@ resolve_symbol (Dwfl_Module *referer, struct reloc_symtab_cache *symtab, continue; /* We found it! */ - if (shndx == SHN_ABS) + if (shndx == SHN_ABS) /* XXX maybe should apply bias? */ return DWFL_E_NOERROR; + if (m->e_type != ET_REL) + { + sym->st_value += m->symfile->bias; + return DWFL_E_NOERROR; + } + /* In an ET_REL file, the symbol table values are relative to the section, not to the module's load base. */ size_t symshstrndx = SHN_UNDEF; -- cgit v1.2.1 From 2fe3aa6c807a4a5d2c767ab53792bf2d0d9ff2b7 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 22 Apr 2009 23:08:04 -0700 Subject: Revert leaked bogon. --- tests/run-addrname-test.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/run-addrname-test.sh b/tests/run-addrname-test.sh index 2a188915..d525523d 100755 --- a/tests/run-addrname-test.sh +++ b/tests/run-addrname-test.sh @@ -64,7 +64,6 @@ EOF testfiles testfile12 testfile14 tempfiles testmaps -remove_files= cat > testmaps < Date: Thu, 23 Apr 2009 07:44:36 -0700 Subject: Add missing dependencies on compression libraries for static builds. --- src/ChangeLog | 4 ++++ src/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index a2e209a1..49b72037 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2009-04-23 Ulrich Drepper + + * Makefile [BUILD_STATIC] (libdw): Add $(zip_LIBS). + 2009-04-20 Roland McGrath * addr2line.c (print_dwarf_function): Honor -s and -A for file names diff --git a/src/Makefile.am b/src/Makefile.am index 64e4478b..c644a062 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -95,7 +95,7 @@ endif if BUILD_STATIC libasm = ../libasm/libasm.a -libdw = ../libdw/libdw.a $(libelf) $(libebl) -ldl +libdw = ../libdw/libdw.a $(zip_LIBS) $(libelf) $(libebl) -ldl libelf = ../libelf/libelf.a else libasm = ../libasm/libasm.so -- cgit v1.2.1 From 4f5157128605162859bbf49f29abc20fee839cf5 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 23 Apr 2009 07:54:53 -0700 Subject: Avoid symbol versioning unless building code for DSO. --- libdwfl/ChangeLog | 5 +++++ libdwfl/dwfl_module_build_id.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index f0b0a284..8f51ca73 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,8 @@ +2009-04-23 Ulrich Drepper + + * dwfl_module_build_id.c: Define versioned symbols only if SHARED is + defined. Otherwise just define the latest version. + 2009-04-22 Roland McGrath * relocate.c (resolve_symbol): Apply correct bias to st_value found in diff --git a/libdwfl/dwfl_module_build_id.c b/libdwfl/dwfl_module_build_id.c index e1256db7..d7bbb3ca 100644 --- a/libdwfl/dwfl_module_build_id.c +++ b/libdwfl/dwfl_module_build_id.c @@ -174,6 +174,7 @@ __dwfl_module_build_id (Dwfl_Module *mod, *vaddr = mod->build_id_vaddr; return mod->build_id_len; } +#ifdef SHARED extern __typeof__ (dwfl_module_build_id) INTUSE(dwfl_module_build_id) __attribute__ ((alias ("__dwfl_module_build_id"))); asm (".symver " @@ -190,3 +191,7 @@ _BUG_COMPAT_dwfl_module_build_id (Dwfl_Module *mod, } asm (".symver " "_BUG_COMPAT_dwfl_module_build_id, dwfl_module_build_id@ELFUTILS_0.130"); +#else +extern __typeof__ (dwfl_module_build_id) dwfl_module_build_id + __attribute__ ((alias ("__dwfl_module_build_id"))); +#endif -- cgit v1.2.1 From f9545c4ac7ec2cf0d5b69aa2db043f9f4df6c6c5 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 23 Apr 2009 07:59:02 -0700 Subject: Fix building tests with mudflap. --- tests/ChangeLog | 5 +++++ tests/Makefile.am | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/ChangeLog b/tests/ChangeLog index 70e9c027..f1fd512b 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2009-04-23 Ulrich Drepper + + * Makefile [BUILD_STATIC] (libdw): Add $(zip_LIBS). + (rdwrmmap_LDADD): Add $(libmudflap). + 2009-04-21 Roland McGrath * testfile50.bz2: New data file. diff --git a/tests/Makefile.am b/tests/Makefile.am index 81c1ab76..9f4ccddb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -160,7 +160,7 @@ installcheck-local: endif !STANDALONE if MUDFLAP -static_build=yes +static_build = yes libmudflap = -lmudflap endif @@ -171,7 +171,7 @@ libasm = -lasm libebl = -lebl else !STANDALONE if BUILD_STATIC -libdw = ../libdw/libdw.a $(libelf) $(libebl) -ldl +libdw = ../libdw/libdw.a $(zip_LIBS) $(libelf) $(libebl) -ldl libelf = ../libelf/libelf.a libasm = ../libasm/libasm.a else @@ -225,7 +225,7 @@ asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -rdwrmmap_LDADD = $(libelf) +rdwrmmap_LDADD = $(libelf) $(libmudflap) dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl arls_LDADD = $(libelf) $(libmudflap) dwfl_bug_fd_leak_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -- cgit v1.2.1 From 300f3a41d5e22f4e6c634ed652ebc2c90303f89f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 23 Apr 2009 08:20:16 -0700 Subject: 0.141 release. --- config/elfutils.spec.in | 9 +++++++++ configure.ac | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/config/elfutils.spec.in b/config/elfutils.spec.in index f67d4590..04fc34b3 100644 --- a/config/elfutils.spec.in +++ b/config/elfutils.spec.in @@ -183,6 +183,15 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libelf.a %changelog +* Thu Apr 23 2009 Ulrich Drepper 0.141-1 +- libebl: sparc backend fixes; some more arm backend support +- libdwfl: fix dwfl_module_build_id for prelinked DSO case; + fixes in core file support; dwfl_module_getsym interface + improved for non-address symbols +- strip: fix infinite loop on strange inputs with -f +- addr2line: take -j/--section=NAME option for binutils compatibility + (same effect as '(NAME)0x123' syntax already supported) + * Mon Feb 16 2009 Ulrich Drepper 0.140-1 - libelf: Fix regression in creation of section header - libdwfl: Less strict behavior if DWARF reader ist just used to diff --git a/configure.ac b/configure.ac index aeb40d11..4931530c 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software Foundation, dnl Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. dnl -AC_INIT([Red Hat elfutils],[0.140.90],[http://bugzilla.redhat.com/bugzilla/], +AC_INIT([Red Hat elfutils],[0.141],[http://bugzilla.redhat.com/bugzilla/], [elfutils]) AC_CONFIG_AUX_DIR([config]) -- cgit v1.2.1