diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-04-26 14:23:02 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-04-26 14:24:36 +0200 |
| commit | 8dcb6d0af07fda3607b541857e4f3970a74ed55b (patch) | |
| tree | 06a15719ac286241c9faf9bfd4a802d57ee08bc8 /elf/dl-libc.c | |
| parent | c935789bdf40ba22b5698da869d3a4789797e09f (diff) | |
| download | glibc-8dcb6d0af07fda3607b541857e4f3970a74ed55b.tar glibc-8dcb6d0af07fda3607b541857e4f3970a74ed55b.tar.gz glibc-8dcb6d0af07fda3607b541857e4f3970a74ed55b.tar.bz2 glibc-8dcb6d0af07fda3607b541857e4f3970a74ed55b.zip | |
dlfcn: Do not use rtld_active () to determine ld.so state (bug 29078)
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.
Commit 466c1ea15f461edb8e3ffaf5d86d708876343bbf ("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 commit 8e1472d2c1e25e6eabc2059170731365f6d5b3d1 ("ld.so:
Examine GLRO to detect inactive loader [BZ #20204]").
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'elf/dl-libc.c')
| -rw-r--r-- | elf/dl-libc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/elf/dl-libc.c b/elf/dl-libc.c index a7180d0af8..266e068da6 100644 --- a/elf/dl-libc.c +++ b/elf/dl-libc.c @@ -156,7 +156,7 @@ __libc_dlopen_mode (const char *name, int mode) args.caller_dlopen = RETURN_ADDRESS (0); #ifdef SHARED - if (!rtld_active ()) + if (GLRO (dl_dlfcn_hook) != NULL) return GLRO (dl_dlfcn_hook)->libc_dlopen_mode (name, mode); #endif return dlerror_run (do_dlopen, &args) ? NULL : (void *) args.map; @@ -184,7 +184,7 @@ __libc_dlsym (void *map, const char *name) args.name = name; #ifdef SHARED - if (!rtld_active ()) + if (GLRO (dl_dlfcn_hook) != NULL) return GLRO (dl_dlfcn_hook)->libc_dlsym (map, name); #endif return (dlerror_run (do_dlsym, &args) ? NULL @@ -198,7 +198,7 @@ void * __libc_dlvsym (void *map, const char *name, const char *version) { #ifdef SHARED - if (!rtld_active ()) + if (GLRO (dl_dlfcn_hook) != NULL) return GLRO (dl_dlfcn_hook)->libc_dlvsym (map, name, version); #endif @@ -221,7 +221,7 @@ int __libc_dlclose (void *map) { #ifdef SHARED - if (!rtld_active ()) + if (GLRO (dl_dlfcn_hook) != NULL) return GLRO (dl_dlfcn_hook)->libc_dlclose (map); #endif return dlerror_run (do_dlclose, map); |