diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | elf/dl-addr.c | 16 | ||||
| -rw-r--r-- | elf/dl-lookup.c | 2 |
3 files changed, 22 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 3cc47abaff..80e8983826 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-09-26 Ulrich Drepper <drepper@redhat.com> + + * elf/dynamic-link.h (elf_get_dynamic_info): Relocate DT_HASH entry + if necessary. + * elf/dl-lookup.c (_dl_setup_hash): DT_HASH entry is already relocated. + * elf/dl-addr.c (_dl_addr): Use .hash[1] entry to determine end of the + symbol table if necessary. + 2002-09-26 Roland McGrath <roland@redhat.com> * stdlib/longlong.h: Replaced with current version from GCC mainline, diff --git a/elf/dl-addr.c b/elf/dl-addr.c index 11f8311030..66cec39eb4 100644 --- a/elf/dl-addr.c +++ b/elf/dl-addr.c @@ -28,7 +28,7 @@ _dl_addr (const void *address, Dl_info *info) { const ElfW(Addr) addr = DL_LOOKUP_ADDRESS (address); struct link_map *l, *match; - const ElfW(Sym) *symtab, *matchsym; + const ElfW(Sym) *symtab, *matchsym, *symtabend; const char *strtab; ElfW(Word) strtabsize; @@ -71,11 +71,21 @@ _dl_addr (const void *address, Dl_info *info) symtab = (const void *) D_PTR (match, l_info[DT_SYMTAB]); strtab = (const void *) D_PTR (match, l_info[DT_STRTAB]); + strtabsize = match->l_info[DT_STRSZ]->d_un.d_val; + if (match->l_info[DT_HASH] != NULL) + symtabend = symtab + ((Elf_Symndx *) D_PTR (match, l_info[DT_HASH]))[1]; + else + /* There is no direct way to determine the number of symbols in the + dynamic symbol table and no hash table is present. The ELF + binary is ill-formed but what shall we do? Use the beginning of + the string table which generally follows the symbol table. */ + symtabend = strtab; + /* We assume that the string table follows the symbol table, because there is no way in ELF to know the size of the dynamic symbol table!! */ - for (matchsym = NULL; (void *) symtab < (void *) strtab; ++symtab) + for (matchsym = NULL; (void *) symtab < (void *) symtabend; ++symtab) if (addr >= match->l_addr + symtab->st_value && ((symtab->st_size == 0 && addr == match->l_addr + symtab->st_value) || addr < match->l_addr + symtab->st_value + symtab->st_size) @@ -83,7 +93,7 @@ _dl_addr (const void *address, Dl_info *info) && (matchsym == NULL || matchsym->st_value < symtab->st_value) && (ELFW(ST_BIND) (symtab->st_info) == STB_GLOBAL || ELFW(ST_BIND) (symtab->st_info) == STB_WEAK)) - matchsym = symtab; + matchsym = (ElfW(Sym) *) symtab; if (matchsym) { diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index e2f5506030..1c3d9b5ad5 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -587,7 +587,7 @@ _dl_setup_hash (struct link_map *map) if (!map->l_info[DT_HASH]) return; - hash = (void *)(map->l_addr + map->l_info[DT_HASH]->d_un.d_ptr); + hash = (void *) D_PTR (map, l_info[DT_HASH]); map->l_nbuckets = *hash++; nchain = *hash++; |