From: "H.J. Lu via Libc-alpha" <libc-alpha@sourceware.org>
To: libc-alpha@sourceware.org
Subject: [PATCH] elf: Also try DT_RUNPATH for internal dlopen [BZ #28455]
Date: Fri, 15 Oct 2021 13:07:00 -0700 [thread overview]
Message-ID: <20211015200700.3989961-1-hjl.tools@gmail.com> (raw)
DT_RUNPATH is only used to find the immediate dependencies of the
executable or shared object containing the DT_RUNPATH entry. The
glibc internal dlopen call should try the DT_RUNPATH of the executable.
This partially fixes BZ #28455.
---
elf/Makefile | 9 +++++++--
elf/dl-load.c | 30 ++++++++++++++++++++++--------
elf/tst-audit14a.c | 1 +
nss/Makefile | 3 +++
nss/tst-nss-test1a.c | 1 +
5 files changed, 34 insertions(+), 10 deletions(-)
create mode 100644 elf/tst-audit14a.c
create mode 100644 nss/tst-nss-test1a.c
diff --git a/elf/Makefile b/elf/Makefile
index eeef71b82a..739cd6c8ef 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -239,10 +239,10 @@ ifneq ($(selinux-enabled),1)
tests-execstack-yes = tst-execstack tst-execstack-needed tst-execstack-prog
endif
ifeq ($(have-depaudit),yes)
-tests += tst-audit14 tst-audit15 tst-audit16
+tests += tst-audit14 tst-audit15 tst-audit16 tst-audit14a
ifeq ($(run-built-tests),yes)
tests-special += $(objpfx)tst-audit14-cmp.out $(objpfx)tst-audit15-cmp.out \
- $(objpfx)tst-audit16-cmp.out
+ $(objpfx)tst-audit16-cmp.out $(objpfx)tst-audit14a-cmp.out
endif
endif
endif
@@ -1479,6 +1479,8 @@ tst-auditmany-ENV = \
LDFLAGS-tst-audit14 = -Wl,--audit=tst-auditlogmod-1.so
$(objpfx)tst-auditlogmod-1.so: $(libsupport)
$(objpfx)tst-audit14.out: $(objpfx)tst-auditlogmod-1.so
+LDFLAGS-tst-audit14a = -Wl,--audit=tst-auditlogmod-1.so,--enable-new-dtags
+$(objpfx)tst-audit14a.out: $(objpfx)tst-auditlogmod-1.so
LDFLAGS-tst-audit15 = \
-Wl,--audit=tst-auditlogmod-1.so,--depaudit=tst-auditlogmod-2.so
$(objpfx)tst-auditlogmod-2.so: $(libsupport)
@@ -1505,6 +1507,9 @@ tst-audit17-ENV = LD_AUDIT=$(objpfx)tst-auditmod17.so
$(objpfx)tst-audit14-cmp.out: tst-audit14.exp $(objpfx)tst-audit14.out
cmp $^ > $@; \
$(evaluate-test)
+$(objpfx)tst-audit14a-cmp.out: tst-audit14.exp $(objpfx)tst-audit14a.out
+ cmp $^ > $@; \
+ $(evaluate-test)
$(objpfx)tst-audit15-cmp.out: tst-audit15.exp $(objpfx)tst-audit15.out
cmp $^ > $@; \
$(evaluate-test)
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 18d3e8fe64..95f4d13c12 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -2162,15 +2162,29 @@ _dl_map_object (struct link_map *loader, const char *name,
}
/* If dynamically linked, try the DT_RPATH of the executable
- itself. NB: we do this for lookups in any namespace. */
+ itself. NB: we do this for lookups in any namespace.
+
+ Also try DT_RUNPATH for glibc internal dlopen call. */
if (fd == -1 && !did_main_map
- && main_map != NULL && main_map->l_type != lt_loaded
- && cache_rpath (main_map, &main_map->l_rpath_dirs, DT_RPATH,
- "RPATH"))
- fd = open_path (name, namelen, mode,
- &main_map->l_rpath_dirs,
- &realname, &fb, loader ?: main_map, LA_SER_RUNPATH,
- &found_other_class);
+ && main_map != NULL && main_map->l_type != lt_loaded)
+ {
+ struct r_search_path_struct l_rpath_dirs;
+ struct r_search_path_struct *l_rpath_dirs_p = NULL;
+ if (cache_rpath (main_map, &main_map->l_rpath_dirs,
+ DT_RPATH, "RPATH"))
+ l_rpath_dirs_p = &main_map->l_rpath_dirs;
+ else if (__glibc_unlikely (mode & __RTLD_DLOPEN))
+ {
+ l_rpath_dirs.dirs = NULL;
+ if (cache_rpath (main_map, &l_rpath_dirs, DT_RUNPATH,
+ "RUNPATH"))
+ l_rpath_dirs_p = &l_rpath_dirs;
+ }
+ if (l_rpath_dirs_p)
+ fd = open_path (name, namelen, mode, l_rpath_dirs_p,
+ &realname, &fb, loader ?: main_map,
+ LA_SER_RUNPATH, &found_other_class);
+ }
}
/* Try the LD_LIBRARY_PATH environment variable. */
diff --git a/elf/tst-audit14a.c b/elf/tst-audit14a.c
new file mode 100644
index 0000000000..c6232eacf2
--- /dev/null
+++ b/elf/tst-audit14a.c
@@ -0,0 +1 @@
+#include "tst-audit14.c"
diff --git a/nss/Makefile b/nss/Makefile
index bccf9f2806..cd99e04732 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -58,6 +58,7 @@ tests-static = tst-field
tests-internal = tst-field
tests = test-netdb test-digits-dots tst-nss-getpwent bug17079 \
tst-nss-test1 \
+ tst-nss-test1a \
tst-nss-test2 \
tst-nss-test4 \
tst-nss-test5
@@ -189,3 +190,5 @@ endif
$(objpfx)tst-nss-files-alias-leak.out: $(objpfx)/libnss_files.so
$(objpfx)tst-nss-files-alias-truncated.out: $(objpfx)/libnss_files.so
+
+LDFLAGS-tst-nss-test1a = -Wl,--enable-new-dtags
diff --git a/nss/tst-nss-test1a.c b/nss/tst-nss-test1a.c
new file mode 100644
index 0000000000..f1428259c8
--- /dev/null
+++ b/nss/tst-nss-test1a.c
@@ -0,0 +1 @@
+#include "tst-nss-test1.c"
--
2.31.1
next reply other threads:[~2021-10-15 20:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-15 20:07 H.J. Lu via Libc-alpha [this message]
2021-11-29 12:50 ` PING^1 [PATCH] elf: Also try DT_RUNPATH for internal dlopen [BZ #28455] H.J. Lu via Libc-alpha
2021-11-29 15:30 ` Carlos O'Donell via Libc-alpha
2021-12-03 3:20 ` H.J. Lu via Libc-alpha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211015200700.3989961-1-hjl.tools@gmail.com \
--to=libc-alpha@sourceware.org \
--cc=hjl.tools@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).