forked from rpms/glibc
c3e41ff9aa
* Tue Sep 06 2022 Arjun Shankar <arjun@redhat.com> - 2.34-42 - Co-Authored-By: Benjamin Herrenschmidt <benh@amazon.com> - Retain .gnu_debuglink section in libc.so.6 (#2090744) - Remove redundant ld.so debuginfo file (#2090744) * Tue Aug 23 2022 Arjun Shankar <arjun@redhat.com> - 2.34-41 - Sync with upstream branch release/2.34/master, commit 68507377f249d165f1f35502d96e9365edb07d9a: - socket: Check lengths before advancing pointer in CMSG_NXTHDR - alpha: Fix generic brk system call emulation in __brk_call (bug 29490) - stdlib: Fixup mbstowcs NULL __dst handling. [BZ #29279] - stdlib: Remove attr_write from mbstows if dst is NULL [BZ: 29265] - Update syscall lists for Linux 5.19 - dlfcn: Pass caller pointer to static dlopen implementation (bug 29446) Resolves: #2115831 Resolves: #2116960
25 lines
795 B
Diff
25 lines
795 B
Diff
commit 875b2414cd68df64aeead651a9b05ae9bc3d88ef
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
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 --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c
|
|
index 9c59c751c4eaf7a7..739d17baafe928cc 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 *
|