diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2014-07-24 20:47:17 +0200 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2014-07-28 21:00:13 +0200 |
| commit | 475849fdb25265706772905b856cd7028c566a71 (patch) | |
| tree | 19dc18dd506c3be522167e0523586f39adbbc508 | |
| parent | e7b2a92bbc10f1f0e31777591fd697e344fbacad (diff) | |
| download | elfutils-475849fdb25265706772905b856cd7028c566a71.tar.gz | |
Fix report_r_debug for prelinked libraries
Signed-off-by: Jan Kratochvil <jan.kratochvil@redhat.com>
| -rw-r--r-- | libdwfl/ChangeLog | 6 | ||||
| -rw-r--r-- | libdwfl/link_map.c | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index 4a1b9d5c..ab47c404 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,9 @@ +2014-07-24 Jan Kratochvil <jan.kratochvil@redhat.com> + + Fix report_r_debug for prelinked libraries. + * link_map.c (report_r_debug): Comment out variable l_addr. + Use instead new variable base recalculated from l_ld. + 2014-06-24 Kurt Roeckx <kurt@roeckx.be> * linux-pid-attach.c: Make it build on non linux hosts. diff --git a/libdwfl/link_map.c b/libdwfl/link_map.c index 2913d9f7..272f89ba 100644 --- a/libdwfl/link_map.c +++ b/libdwfl/link_map.c @@ -321,7 +321,11 @@ report_r_debug (uint_fast8_t elfclass, uint_fast8_t elfdata, if (read_addrs (next, 4)) return release_buffer (-1); - GElf_Addr l_addr = addrs[0]; + /* Unused: l_addr is the difference between the address in memory + and the ELF file when the core was created. We need to + recalculate the difference below because the ELF file we use + might be differently pre-linked. */ + // GElf_Addr l_addr = addrs[0]; GElf_Addr l_name = addrs[1]; GElf_Addr l_ld = addrs[2]; next = addrs[3]; @@ -432,11 +436,14 @@ report_r_debug (uint_fast8_t elfclass, uint_fast8_t elfdata, if (valid) { + // It is like l_addr but it handles differently prelinked + // files at core dumping vs. core loading time. + GElf_Addr base = l_ld - elf_dynamic_vaddr; if (r_debug_info_module == NULL) { // XXX hook for sysroot mod = __libdwfl_report_elf (dwfl, basename (name), - name, fd, elf, l_addr, + name, fd, elf, base, true, true); if (mod != NULL) { @@ -444,7 +451,7 @@ report_r_debug (uint_fast8_t elfclass, uint_fast8_t elfdata, fd = -1; } } - else if (__libdwfl_elf_address_range (elf, l_addr, true, + else if (__libdwfl_elf_address_range (elf, base, true, true, NULL, NULL, &r_debug_info_module->start, &r_debug_info_module->end, |