dlfcn: Pass caller pointer to static dlopen implementation (bug 29446)

Fixes commit 0c1c3a771eceec46e66ce1183cf988e2303bd373 ("dlfcn: Move
dlopen into libc").

(cherry picked from commit ed0185e4129130cbe081c221efb758fb400623ce)

diff --git a/NEWS b/NEWS
index 9b162ca84658833faa9234f50e822f3e290d5245..fdb7a11b152dae9d4820acf1faf9d6b9f7276418 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,7 @@ The following bugs are resolved with this release:
   [29214] nptl: pthread_setcanceltype fails to set type
   [29225] network: Mistyped define statement in socket/sys/socket.h in
     line 184
+  [29446] _dlopen now ignores dl_caller argument in static mode
 
 \f
 Version 2.35

diff --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c
index 2696dde4b1cdf510b78f173e8b69155890ddae66..9b07b4e132f2e73d00339d8702ff34c1d455ac23 100644 (file)
--- a/dlfcn/dlopen.c
+++ b/dlfcn/dlopen.c
@@ -90,7 +90,7 @@ compat_symbol (libdl, ___dlopen, dlopen, GLIBC_2_1);
 void *
 __dlopen (const char *file, int mode, void *dl_caller)
 {
-  return dlopen_implementation (file, mode, RETURN_ADDRESS (0));
+  return dlopen_implementation (file, mode, dl_caller);
 }
 
 void *