Attachment 912508 Details for Bug 1112610 – Do not rely on link_map.l_addr.

[patch] Do not rely on link_map.l_addr.

l_addr.patch (text/plain), 1.34 KB, created by Jan Kratochvil on 2014-06-26 18:05:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kratochvil

Created: 2014-06-26 18:05:06 UTC

Size: 1.34 KB

patch

obsolete

>diff --git a/libdwfl/link_map.c b/libdwfl/link_map.c
>index 2913d9f..9ee1dc0 100644
>--- a/libdwfl/link_map.c
>+++ b/libdwfl/link_map.c
>@@ -321,7 +321,8 @@ 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:
>+      // GElf_Addr l_addr = addrs[0];
>       GElf_Addr l_name = addrs[1];
>       GElf_Addr l_ld = addrs[2];
>       next = addrs[3];
>@@ -432,11 +433,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 +448,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,

Actions: View | Diff

Attachments on bug 1112610: 912508