mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

[BZ #4131]

Browse Source 
2007-05-06  Ulrich Drepper  <drepper@redhat.com>
	[BZ #4131]
	* elf/dl-addr.c (_dl_addr): Compare address with actual segment
	boundaries to work around systems with overlapping binary loading.
	Based on a patch by Suzuki <suzuki@in.ibm.com>.
This commit is contained in:
Ulrich Drepper 2007-05-06 21:01:32 +00:00
parent 30b323ab4e
commit ffecd39b9c
2 changed files with 122 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-05-06 Ulrich Drepper <drepper@redhat.com>
[BZ #4131]
* elf/dl-addr.c (_dl_addr): Compare address with actual segment
boundaries to work around systems with overlapping binary loading.
Based on a patch by Suzuki <suzuki@in.ibm.com>.
2007-05-04 Ulrich Drepper <drepper@redhat.com> 2007-05-04 Ulrich Drepper <drepper@redhat.com>
* stdio-common/vfprintf.c (process_string_arg): Adjust call to * stdio-common/vfprintf.c (process_string_arg): Adjust call to

80
elf/dl-addr.c
View File

@ -1,5 +1,5 @@
/* Locate the shared object symbol nearest a given address. /* Locate the shared object symbol nearest a given address.
Copyright (C) 1996-2004, 2005, 2006 Free Software Foundation, Inc. Copyright (C) 1996-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -22,43 +22,11 @@
#include <ldsodefs.h> #include <ldsodefs.h>
int static void
internal_function __attribute ((always_inline))
_dl_addr (const void *address, Dl_info *info, determine_info (const ElfW(Addr) addr, struct link_map *match, Dl_info *info,
struct link_map **mapp, const ElfW(Sym) **symbolp) struct link_map **mapp, const ElfW(Sym) **symbolp)
{ {
const ElfW(Addr) addr = DL_LOOKUP_ADDRESS (address);
/* Protect against concurrent loads and unloads. */
__rtld_lock_lock_recursive (GL(dl_load_lock));
/* Find the highest-addressed object that ADDRESS is not below. */
struct link_map *match = NULL;
for (Lmid_t ns = 0; ns < DL_NNS; ++ns)
for (struct link_map *l = GL(dl_ns)[ns]._ns_loaded; l; l = l->l_next)
if (addr >= l->l_map_start && addr < l->l_map_end)
{
/* We know ADDRESS lies within L if in any shared object.
Make sure it isn't past the end of L's segments. */
size_t n = l->l_phnum;
if (n > 0)
{
do
--n;
while (l->l_phdr[n].p_type != PT_LOAD);
if (addr >= (l->l_addr +
l->l_phdr[n].p_vaddr + l->l_phdr[n].p_memsz))
/* Off the end of the highest-addressed shared object. */
continue;
}
match = l;
break;
}
int result = 0;
if (match != NULL)
{
/* Now we know what object the address lies in. */ /* Now we know what object the address lies in. */
info->dli_fname = match->l_name; info->dli_fname = match->l_name;
info->dli_fbase = (void *) match->l_map_start; info->dli_fbase = (void *) match->l_map_start;
@ -78,8 +46,8 @@ _dl_addr (const void *address, Dl_info *info,
if (match->l_info[DT_ADDRTAGIDX (DT_GNU_HASH) + DT_NUM + DT_THISPROCNUM if (match->l_info[DT_ADDRTAGIDX (DT_GNU_HASH) + DT_NUM + DT_THISPROCNUM
+ DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM] != NULL) + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM] != NULL)
{ {
/* We look at all symbol table entries referenced by the /* We look at all symbol table entries referenced by the hash
hash table. */ table. */
for (Elf_Symndx bucket = 0; bucket < match->l_nbuckets; ++bucket) for (Elf_Symndx bucket = 0; bucket < match->l_nbuckets; ++bucket)
{ {
Elf32_Word symndx = match->l_gnu_buckets[bucket]; Elf32_Word symndx = match->l_gnu_buckets[bucket];
@ -89,8 +57,8 @@ _dl_addr (const void *address, Dl_info *info,
do do
{ {
/* The hash table never references local symbols /* The hash table never references local symbols so
so we can omit that test here. */ we can omit that test here. */
if ((symtab[symndx].st_shndx != SHN_UNDEF if ((symtab[symndx].st_shndx != SHN_UNDEF
|| symtab[symndx].st_value != 0) || symtab[symndx].st_value != 0)
&& ELFW(ST_TYPE) (symtab[symndx].st_info) != STT_TLS && ELFW(ST_TYPE) (symtab[symndx].st_info) != STT_TLS
@ -149,10 +117,42 @@ _dl_addr (const void *address, Dl_info *info,
info->dli_sname = NULL; info->dli_sname = NULL;
info->dli_saddr = NULL; info->dli_saddr = NULL;
} }
}
int
internal_function
_dl_addr (const void *address, Dl_info *info,
struct link_map **mapp, const ElfW(Sym) **symbolp)
{
const ElfW(Addr) addr = DL_LOOKUP_ADDRESS (address);
int result = 0;
/* Protect against concurrent loads and unloads. */
__rtld_lock_lock_recursive (GL(dl_load_lock));
/* Find the highest-addressed object that ADDRESS is not below. */
for (Lmid_t ns = 0; ns < DL_NNS; ++ns)
for (struct link_map *l = GL(dl_ns)[ns]._ns_loaded; l; l = l->l_next)
if (addr >= l->l_map_start && addr < l->l_map_end)
{
/* Make sure it lies within one of L's segments. */
int n = l->l_phnum;
const ElfW(Addr) reladdr = addr - l->l_addr;
while (--n >= 0)
if (l->l_phdr[n].p_type == PT_LOAD)
{
if (reladdr - l->l_phdr[n].p_vaddr >= 0
&& reladdr - l->l_phdr[n].p_vaddr < l->l_phdr[n].p_memsz)
{
determine_info (addr, l, info, mapp, symbolp);
result = 1; result = 1;
goto out;
}
}
} }
out:
__rtld_lock_unlock_recursive (GL(dl_load_lock)); __rtld_lock_unlock_recursive (GL(dl_load_lock));
return result; return result;