mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-12 06:10:10 +00:00
bc56ab1f4a
When audit modules are loaded, ld.so initialization is not yet complete, and rtld_active () returns false even though ld.so is mostly working. Instead, the static dlopen hook is used, but that does not work at all because this is not a static dlopen situation. Commit466c1ea15f("dlfcn: Rework static dlopen hooks") moved the hook pointer into _rtld_global_ro, which means that separate protection is not needed anymore and the hook pointer can be checked directly. The guard for disabling libio vtable hardening in _IO_vtable_check should stay for now. Fixes commit8e1472d2c1("ld.so: Examine GLRO to detect inactive loader [BZ #20204]"). Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> (cherry picked from commit8dcb6d0af0)
47 lines
1.6 KiB
C
47 lines
1.6 KiB
C
/* Locate the shared object symbol nearest a given address.
|
|
Copyright (C) 2003-2021 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
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <dlfcn.h>
|
|
#include <ldsodefs.h>
|
|
#include <shlib-compat.h>
|
|
|
|
int
|
|
__dladdr1 (const void *address, Dl_info *info, void **extra, int flags)
|
|
{
|
|
#ifdef SHARED
|
|
if (GLRO (dl_dlfcn_hook) != NULL)
|
|
return GLRO (dl_dlfcn_hook)->dladdr1 (address, info, extra, flags);
|
|
#endif
|
|
|
|
switch (flags)
|
|
{
|
|
default: /* Make this an error? */
|
|
case 0:
|
|
return _dl_addr (address, info, NULL, NULL);
|
|
case RTLD_DL_SYMENT:
|
|
return _dl_addr (address, info, NULL, (const ElfW(Sym) **) extra);
|
|
case RTLD_DL_LINKMAP:
|
|
return _dl_addr (address, info, (struct link_map **) extra, NULL);
|
|
}
|
|
}
|
|
versioned_symbol (libc, __dladdr1, dladdr1, GLIBC_2_34);
|
|
|
|
#if OTHER_SHLIB_COMPAT (libdl, GLIBC_2_3_3, GLIBC_2_34)
|
|
compat_symbol (libdl, __dladdr1, dladdr1, GLIBC_2_3_3);
|
|
#endif
|