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 04fe72b5f62292dc298bce25fea8fe901d1df058..71a3ab0ed4a69bcb5e45984108f192e8f1906b87 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -112,6 +112,7 @@ The following bugs are resolved with this release:
   [29211] libc: __open_catalog is not y2038 aware
   [29213] libc: gconv_parseconfdir is not y2038 aware
   [29214] nptl: pthread_setcanceltype fails to set type
+  [29446] _dlopen now ignores dl_caller argument in static mode
 
 \f
 Version 2.34

diff --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c
index 9c59c751c4eaf7a7bdd44d278dde8fb6d234e23d..739d17baafe928cce500b094ac177d496339343c 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 *