mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 14:50:05 +00:00
Skip audit if l_reloc_result is NULL
This commit is contained in:
parent
f507f7d598
commit
2e64d2659d
13
ChangeLog
13
ChangeLog
@ -1,3 +1,16 @@
|
||||
2012-11-14 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
[BZ #14831]
|
||||
* elf/Makefile (tests): Add tst-audit8.
|
||||
($(objpfx)tst-audit8): Also depend on $(common-objpfx)math/libm.so.
|
||||
($(objpfx)tst-audit8.out): New target.
|
||||
(tst-audit8-ENV): New variable.
|
||||
* elf/dl-runtime.c (_dl_profile_fixup): Call _dl_fixup to skip
|
||||
audit if l_reloc_result is NULL.
|
||||
(ELF_MACHINE_RUNTIME_FIXUP_PARAMS): Issue an error if it isn't
|
||||
defined and ELF_MACHINE_RUNTIME_FIXUP_ARGS is defined.
|
||||
* elf/tst-audit8.c: New file.
|
||||
|
||||
2012-11-14 Marcus Shawcroft <marcus.shawcroft@linaro.org>
|
||||
|
||||
* io/Makefile (CFLAGS-open.c, CFLAGS-open64.c): Define.
|
||||
|
2
NEWS
2
NEWS
@ -19,7 +19,7 @@ Version 2.17
|
||||
14562, 14568, 14576, 14579, 14583, 14587, 14595, 14602, 14610, 14621,
|
||||
14638, 14645, 14648, 14652, 14660, 14661, 14669, 14683, 14694, 14716,
|
||||
14743, 14767, 14783, 14784, 14785, 14793, 14796, 14797, 14801, 14805,
|
||||
14807, 14809, 14811, 14815, 14821, 14824, 14838.
|
||||
14807, 14809, 14811, 14815, 14821, 14824, 14831, 14838.
|
||||
|
||||
* Port to ARM AArch64 contributed by Linaro.
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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];
|
||||
|
1
elf/tst-audit8.c
Normal file
1
elf/tst-audit8.c
Normal file
@ -0,0 +1 @@
|
||||
#include "../io/pwd.c"
|
Loading…
Reference in New Issue
Block a user