Skip to content

Commit

Permalink
[BZ #2683]
Browse files Browse the repository at this point in the history
2006-08-24  Ulrich Drepper  <drepper@redhat.com>
	[BZ #2683]
	* elf/dl-addr.c (_dl_addr): Don't ignore all undefined symbols.
	If symbol has a value use it.
	* elf/tst-dladdr1.c: New file.
	* elf/Makefile: Add rules to build and run tst-addr1.
  • Loading branch information
Ulrich Drepper committed Aug 24, 2006
1 parent 7463d5c commit 93b53ca
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 5 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2006-08-24 Ulrich Drepper <drepper@redhat.com>

[BZ #2683]
* elf/dl-addr.c (_dl_addr): Don't ignore all undefined symbols.
If symbol has a value use it.
* elf/tst-dladdr1.c: New file.
* elf/Makefile: Add rules to build and run tst-addr1.

2006-08-24 Jakub Jelinek <jakub@redhat.com>

* malloc/malloc.c (sYSMALLOc): Avoid infinite loop if MMAP
Expand Down
4 changes: 3 additions & 1 deletion elf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \
unload3 unload4 unload5 unload6 tst-global1 order2 \
tst-audit1 tst-audit2 \
tst-stackguard1
tst-stackguard1 tst-addr1
# reldep9
test-srcs = tst-pathopt
tests-vis-yes = vismain
Expand Down Expand Up @@ -906,3 +906,5 @@ $(objpfx)tst-leaks1-mem: $(objpfx)tst-leaks1.out
$(common-objpfx)malloc/mtrace $(objpfx)tst-leaks1.mtrace > $@

tst-leaks1-ENV = MALLOC_TRACE=$(objpfx)tst-leaks1.mtrace

$(objpfx)tst-addr1: $(libdl)
6 changes: 4 additions & 2 deletions elf/dl-addr.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ _dl_addr (const void *address, Dl_info *info,
{
/* The hash table never references local symbols
so 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)
#ifdef USE_TLS
&& ELFW(ST_TYPE) (symtab[symndx].st_info) != STT_TLS
#endif
Expand Down Expand Up @@ -125,7 +126,8 @@ _dl_addr (const void *address, Dl_info *info,
#ifdef USE_TLS
&& ELFW(ST_TYPE) (symtab->st_info) != STT_TLS
#endif
&& symtab->st_shndx != SHN_UNDEF
&& (symtab->st_shndx != SHN_UNDEF
|| symtab->st_value != 0)
&& DL_ADDR_SYM_MATCH (match, symtab, matchsym, addr)
&& symtab->st_name < strtabsize)
matchsym = (ElfW(Sym) *) symtab;
Expand Down
19 changes: 19 additions & 0 deletions elf/tst-addr1.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#include <dlfcn.h>
#include <stdio.h>
#include <string.h>

static int
do_test (void)
{
Dl_info i;
if (dladdr (&printf, &i) == 0)
{
puts ("not found");
return 1;
}
printf ("found symbol %s in %s\n", i.dli_sname, i.dli_fname);
return i.dli_sname == NULL || strcmp (i.dli_sname, "printf") != 0;
}

#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"
4 changes: 2 additions & 2 deletions sysdeps/generic/ldsodefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ __BEGIN_DECLS

/* Result of the lookup functions and how to retrieve the base address. */
typedef struct link_map *lookup_t;
# define LOOKUP_VALUE(map) map
# define LOOKUP_VALUE_ADDRESS(map) ((map) ? (map)->l_addr : 0)
#define LOOKUP_VALUE(map) map
#define LOOKUP_VALUE_ADDRESS(map) ((map) ? (map)->l_addr : 0)

/* On some architectures a pointer to a function is not just a pointer
to the actual code of the function but rather an architecture
Expand Down

0 comments on commit 93b53ca

Please sign in to comment.