diff options
| author | Florian Weimer <fweimer@redhat.com> | 2017-12-18 20:04:13 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2017-12-18 20:04:13 +0100 |
| commit | 8e1472d2c1e25e6eabc2059170731365f6d5b3d1 (patch) | |
| tree | 5b29308e6b00178a34422b6f7bb7b4f9252801dc /dlfcn/dladdr1.c | |
| parent | 49b036bce9f021ae994a85aee8b410d20b29c8b7 (diff) | |
| download | glibc-8e1472d2c1e25e6eabc2059170731365f6d5b3d1.tar.gz glibc-8e1472d2c1e25e6eabc2059170731365f6d5b3d1.tar.xz glibc-8e1472d2c1e25e6eabc2059170731365f6d5b3d1.zip | |
ld.so: Examine GLRO to detect inactive loader [BZ #20204]
GLRO (_rtld_global_ro) is read-only after initialization and can therefore not be patched at run time, unlike the hook table addresses and their contents, so this is a desirable hardening feature. The hooks are only needed if ld.so has not been initialized, and this happens only after static dlopen (dlmopen uses a single ld.so object across all namespaces). Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'dlfcn/dladdr1.c')
| -rw-r--r-- | dlfcn/dladdr1.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dlfcn/dladdr1.c b/dlfcn/dladdr1.c index a19f9fdea2..901cf43f6b 100644 --- a/dlfcn/dladdr1.c +++ b/dlfcn/dladdr1.c @@ -17,6 +17,7 @@ <http://www.gnu.org/licenses/>. */ #include <dlfcn.h> +#include <ldsodefs.h> #if !defined SHARED && IS_IN (libdl) @@ -32,7 +33,7 @@ int __dladdr1 (const void *address, Dl_info *info, void **extra, int flags) { # ifdef SHARED - if (__glibc_unlikely (_dlfcn_hook != NULL)) + if (!rtld_active ()) return _dlfcn_hook->dladdr1 (address, info, extra, flags); # endif |