From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 4 Aug 2022 15:54:48 +0000 (+0200)
Subject: dlfcn: Pass caller pointer to static dlopen implementation (bug 29446)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c172a6cb0dda3eb088d37a407bd0506a96a8002;p=thirdparty%2Fglibc.git

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 9b162ca8465..fdb7a11b152 100644
--- 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
 
 
 Version 2.35
diff --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c
index 2696dde4b1c..9b07b4e132f 100644
--- 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 *