forked from pool/glibc
Andreas Schwab
fa41141404
- ldconfig-dynstr.patch: ldconfig: handle .dynstr located in separate segment (bsc#1153149, BZ #25087) OBS-URL: https://build.opensuse.org/request/show/738209 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=543
87 lines
2.4 KiB
Diff
87 lines
2.4 KiB
Diff
ldconfig: handle .dynstr located in separate segment (bug 25087)
|
|
|
|
To determine the load offset of the DT_STRTAB section search for the
|
|
segment containing it, instead of using the load offset of the first
|
|
segment.
|
|
|
|
[BZ #25087]
|
|
* elf/readelflib.c (process_elf_file): Use containing segment for
|
|
DT_STRTAB load offset.
|
|
---
|
|
elf/readelflib.c | 34 +++++++++++++++++++++-------------
|
|
1 file changed, 21 insertions(+), 13 deletions(-)
|
|
|
|
Index: glibc-2.30/elf/readelflib.c
|
|
===================================================================
|
|
--- glibc-2.30.orig/elf/readelflib.c
|
|
+++ glibc-2.30/elf/readelflib.c
|
|
@@ -45,7 +45,6 @@ process_elf_file (const char *file_name,
|
|
{
|
|
int i;
|
|
unsigned int j;
|
|
- ElfW(Addr) loadaddr;
|
|
unsigned int dynamic_addr;
|
|
size_t dynamic_size;
|
|
char *program_interpreter;
|
|
@@ -87,7 +86,6 @@ process_elf_file (const char *file_name,
|
|
libc5/libc6. */
|
|
*flag = FLAG_ELF;
|
|
|
|
- loadaddr = -1;
|
|
dynamic_addr = 0;
|
|
dynamic_size = 0;
|
|
program_interpreter = NULL;
|
|
@@ -98,11 +96,6 @@ process_elf_file (const char *file_name,
|
|
|
|
switch (segment->p_type)
|
|
{
|
|
- case PT_LOAD:
|
|
- if (loadaddr == (ElfW(Addr)) -1)
|
|
- loadaddr = segment->p_vaddr - segment->p_offset;
|
|
- break;
|
|
-
|
|
case PT_DYNAMIC:
|
|
if (dynamic_addr)
|
|
error (0, 0, _("more than one dynamic segment\n"));
|
|
@@ -176,11 +169,6 @@ process_elf_file (const char *file_name,
|
|
}
|
|
|
|
}
|
|
- if (loadaddr == (ElfW(Addr)) -1)
|
|
- {
|
|
- /* Very strange. */
|
|
- loadaddr = 0;
|
|
- }
|
|
|
|
/* Now we can read the dynamic sections. */
|
|
if (dynamic_size == 0)
|
|
@@ -197,7 +185,27 @@ process_elf_file (const char *file_name,
|
|
check_ptr (dyn_entry);
|
|
if (dyn_entry->d_tag == DT_STRTAB)
|
|
{
|
|
- dynamic_strings = (char *) (file_contents + dyn_entry->d_un.d_val - loadaddr);
|
|
+ /* Find the file offset of the segment containing the dynamic
|
|
+ string table. */
|
|
+ ElfW(Off) loadoff = -1;
|
|
+ for (i = 0, segment = elf_pheader;
|
|
+ i < elf_header->e_phnum; i++, segment++)
|
|
+ {
|
|
+ if (segment->p_type == PT_LOAD
|
|
+ && dyn_entry->d_un.d_val >= segment->p_vaddr
|
|
+ && dyn_entry->d_un.d_val < segment->p_vaddr + segment->p_filesz)
|
|
+ {
|
|
+ loadoff = segment->p_vaddr - segment->p_offset;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ if (loadoff == (ElfW(Off)) -1)
|
|
+ {
|
|
+ /* Very strange. */
|
|
+ loadoff = 0;
|
|
+ }
|
|
+
|
|
+ dynamic_strings = (char *) (file_contents + dyn_entry->d_un.d_val - loadoff);
|
|
check_ptr (dynamic_strings);
|
|
break;
|
|
}
|