From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 591BA38582AE; Thu, 4 Aug 2022 19:55:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 591BA38582AE Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/release/2.34/master] dlfcn: Pass caller pointer to static dlopen implementation (bug 29446) X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/release/2.34/master X-Git-Oldrev: b2f32e746492615a6eb3e66fac1e766e32e8deb1 X-Git-Newrev: 875b2414cd68df64aeead651a9b05ae9bc3d88ef Message-Id: <20220804195558.591BA38582AE@sourceware.org> Date: Thu, 4 Aug 2022 19:55:58 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2022 19:55:58 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=875b2414cd68df64aeead651a9b05ae9bc3d88ef commit 875b2414cd68df64aeead651a9b05ae9bc3d88ef Author: Florian Weimer Date: Thu Aug 4 17:54:48 2022 +0200 dlfcn: Pass caller pointer to static dlopen implementation (bug 29446) Fixes commit 0c1c3a771eceec46e66ce1183cf988e2303bd373 ("dlfcn: Move dlopen into libc"). (cherry picked from commit ed0185e4129130cbe081c221efb758fb400623ce) Diff: --- NEWS | 1 + dlfcn/dlopen.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 04fe72b5f6..71a3ab0ed4 100644 --- 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 Version 2.34 diff --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c index 9c59c751c4..739d17baaf 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 *