diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-11-14 15:44:40 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-11-14 15:44:40 -0800 |
| commit | 2e64d2659d3edaebc792ac596a9863f1626e5c25 (patch) | |
| tree | 4d551713145a5b3e0ff1351c0de7f8cab70a7fc4 /elf | |
| parent | f507f7d598aec75a51689abf5863122b49ca6954 (diff) | |
| download | glibc-2e64d2659d3edaebc792ac596a9863f1626e5c25.tar.gz glibc-2e64d2659d3edaebc792ac596a9863f1626e5c25.tar.xz glibc-2e64d2659d3edaebc792ac596a9863f1626e5c25.zip | |
Skip audit if l_reloc_result is NULL
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/Makefile | 6 | ||||
| -rw-r--r-- | elf/dl-runtime.c | 22 | ||||
| -rw-r--r-- | elf/tst-audit8.c | 1 |
3 files changed, 27 insertions, 2 deletions
diff --git a/elf/Makefile b/elf/Makefile index c2f0e2058f..7e5c9c87e9 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -142,7 +142,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ tst-dlmodcount tst-dlopenrpath tst-deep1 \ tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \ - tst-audit1 tst-audit2 \ + tst-audit1 tst-audit2 tst-audit8 \ tst-stackguard1 tst-addr1 tst-thrlock \ tst-unique1 tst-unique2 tst-unique3 tst-unique4 \ tst-initorder tst-initorder2 tst-relsort1 @@ -1020,6 +1020,10 @@ $(objpfx)tst-audit7: $(objpfx)tst-auditmod7a.so $(objpfx)tst-audit7.out: $(objpfx)tst-auditmod7b.so tst-audit7-ENV = LD_AUDIT=$(objpfx)tst-auditmod7b.so +$(objpfx)tst-audit8: $(common-objpfx)math/libm.so +$(objpfx)tst-audit8.out: $(objpfx)tst-auditmod1.so +tst-audit8-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so + $(objpfx)tst-global1: $(libdl) $(objpfx)tst-global1.out: $(objpfx)testobj6.so $(objpfx)testobj2.so diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c index 2e02a218e6..7a3bc9ed9d 100644 --- a/elf/dl-runtime.c +++ b/elf/dl-runtime.c @@ -1,5 +1,5 @@ /* On-demand PLT fixup for shared objects. - Copyright (C) 1995-2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 1995-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -164,6 +164,26 @@ _dl_profile_fixup ( { void (*mcount_fct) (ElfW(Addr), ElfW(Addr)) = INTUSE(_dl_mcount); + if (l->l_reloc_result == NULL) + { + /* BZ #14843: ELF_DYNAMIC_RELOCATE is called before l_reloc_result + is allocated. We will get here if ELF_DYNAMIC_RELOCATE calls a + resolver function to resolve an IRELATIVE relocation and that + resolver calls a function that is not yet resolved (lazy). For + example, the resolver in x86-64 libm.so calls __get_cpu_features + defined in libc.so. Skip audit and resolve the external function + in this case. */ + *framesizep = -1; + return _dl_fixup ( +# ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS +# ifndef ELF_MACHINE_RUNTIME_FIXUP_PARAMS +# error Please define ELF_MACHINE_RUNTIME_FIXUP_PARAMS. +# endif + ELF_MACHINE_RUNTIME_FIXUP_PARAMS, +# endif + l, reloc_arg); + } + /* This is the address in the array where we store the result of previous relocations. */ struct reloc_result *reloc_result = &l->l_reloc_result[reloc_index]; diff --git a/elf/tst-audit8.c b/elf/tst-audit8.c new file mode 100644 index 0000000000..63656b4ee9 --- /dev/null +++ b/elf/tst-audit8.c @@ -0,0 +1 @@ +#include "../io/pwd.c" |