about summary refs log tree commit diff
path: root/dlfcn/dlopenold.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2022-04-26 14:23:02 +0200
committerFlorian Weimer <fweimer@redhat.com>2022-04-26 14:24:36 +0200
commit8dcb6d0af07fda3607b541857e4f3970a74ed55b (patch)
tree06a15719ac286241c9faf9bfd4a802d57ee08bc8 /dlfcn/dlopenold.c
parentc935789bdf40ba22b5698da869d3a4789797e09f (diff)
downloadglibc-8dcb6d0af07fda3607b541857e4f3970a74ed55b.tar.gz
glibc-8dcb6d0af07fda3607b541857e4f3970a74ed55b.tar.xz
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 'dlfcn/dlopenold.c')
-rw-r--r--dlfcn/dlopenold.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dlfcn/dlopenold.c b/dlfcn/dlopenold.c
index 67601434df..5c21a00496 100644
--- a/dlfcn/dlopenold.c
+++ b/dlfcn/dlopenold.c
@@ -70,7 +70,7 @@ __dlopen_nocheck (const char *file, int mode)
     mode |= RTLD_LAZY;
   args.mode = mode;
 
-  if (!rtld_active ())
+  if (GLRO (dl_dlfcn_hook) != NULL)
     return GLRO (dl_dlfcn_hook)->dlopen (file, mode, RETURN_ADDRESS (0));
 
   return _dlerror_run (dlopen_doit, &args) ? NULL : args.new;