From 8dcb6d0af07fda3607b541857e4f3970a74ed55b Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 26 Apr 2022 14:23:02 +0200 Subject: 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 --- dlfcn/dladdr1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dlfcn/dladdr1.c') diff --git a/dlfcn/dladdr1.c b/dlfcn/dladdr1.c index 5dadfd1220..e0c9526c90 100644 --- a/dlfcn/dladdr1.c +++ b/dlfcn/dladdr1.c @@ -24,7 +24,7 @@ int __dladdr1 (const void *address, Dl_info *info, void **extra, int flags) { #ifdef SHARED - if (!rtld_active ()) + if (GLRO (dl_dlfcn_hook) != NULL) return GLRO (dl_dlfcn_hook)->dladdr1 (address, info, extra, flags); #endif -- cgit 1.4.1