From: "Vivek Das Mohapatra" <vivek@collabora.com>
To: libc-alpha <libc-alpha@sourceware.org>
Subject: [RFC][PATCH v6 12/20] Use the new DSO finder helper function since we have it
Date: Tue, 15 Dec 2020 18:44:52 +0000 [thread overview]
Message-ID: <20201215184500.25915-13-vivek@collabora.com> (raw)
In-Reply-To: <20201215184500.25915-1-vivek@collabora.com>
---
elf/dl-load.c | 43 +++++++++++++++++--------------------------
1 file changed, 17 insertions(+), 26 deletions(-)
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 0e6a493e07..a31f3771de 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -2133,35 +2133,26 @@ _dl_map_object (struct link_map *loader, const char *name,
#endif
/* Look for this name among those already loaded. */
- for (l = GL(dl_ns)[nsid]._ns_loaded; l; l = l->l_next)
+ l = _dl_find_dso (name, nsid);
+
+ if (l != NULL)
{
- /* If the requested name matches the soname of a loaded object,
- use that object. Elide this check for names that have not
- yet been opened. */
- if (__glibc_unlikely ((l->l_faked | l->l_removed) != 0))
- continue;
- if (!_dl_name_match_p (name, l))
- {
- const char *soname;
-
- if (__glibc_likely (l->l_soname_added)
- || l->l_info[DT_SONAME] == NULL)
- continue;
-
- soname = ((const char *) D_PTR (l, l_info[DT_STRTAB])
- + l->l_info[DT_SONAME]->d_un.d_val);
- if (strcmp (name, soname) != 0)
- continue;
-
- /* We have a match on a new name -- cache it. */
- add_name_to_object (l, soname);
- l->l_soname_added = 1;
- }
-
- /* We have a match. */
+#ifdef SHARED
+ /* If we are trying to load a DF_GNU_1_UNIQUE flagged DSO which WAS
+ already opened in the target NS but with RTLD_ISOLATE so it WAS NOT
+ created as a proxy we need to error out since we cannot satisfy the
+ DF_GNU_1_UNIQUE is-equivalent-to RTLD_SHARED semantics. */
+ if (!(mode & RTLD_ISOLATE) &&
+ (l->l_ns != LM_ID_BASE) &&
+ (l->l_gnu_flags_1 & DF_GNU_1_UNIQUE) &&
+ !l->l_proxy)
+ {
+ _dl_signal_error (EEXIST, name, NULL,
+ N_("object cannot be demoted to a proxy"));
+ }
+#endif
return l;
}
-
/* Display information if we are debugging. */
if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES)
&& loader != NULL)
--
2.20.1
next prev parent reply other threads:[~2020-12-15 18:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-15 18:44 [RFC][PATCH v6 00/20] Implementation of RTLD_SHARED for dlmopen Vivek Das Mohapatra
2020-12-15 18:44 ` [RFC][PATCH v6 01/20] Declare and describe the dlmopen RTLD_SHARED flag Vivek Das Mohapatra
2020-12-15 18:44 ` [RFC][PATCH v6 02/20] include/link.h: Update the link_map struct to allow proxies Vivek Das Mohapatra
2020-12-15 18:44 ` [RFC][PATCH v6 03/20] elf/dl-object.c: Implement a helper function to proxy link_map entries Vivek Das Mohapatra
2020-12-15 18:44 ` [RFC][PATCH v6 04/20] elf/dl-load.c, elf-dl-open.c: Implement RTLD_SHARED dlmopen proxying Vivek Das Mohapatra
2020-12-15 18:44 ` [RFC][PATCH v6 05/20] elf/dl-fini.c: Handle proxy link_map entries in the shutdown path Vivek Das Mohapatra
2020-12-15 18:44 ` [RFC][PATCH v6 06/20] elf/dl-init.c: Skip proxied link map entries in the dl init path Vivek Das Mohapatra
2020-12-15 18:44 ` [RFC][PATCH v6 07/20] elf/dl-open.c: Don't try libc linit in namespaces with no libc mapping Vivek Das Mohapatra
2020-12-15 18:44 ` [RFC][PATCH v6 08/20] elf/dl-open.c: when creating a proxy check the libc_map in NS 0 Vivek Das Mohapatra
2020-12-15 18:44 ` [RFC][PATCH v6 09/20] Define a new dynamic section tag - DT_GNU_FLAGS_1 Vivek Das Mohapatra
2020-12-15 18:44 ` [RFC][PATCH v6 10/20] Abstract the loaded-DSO search code into a private helper function Vivek Das Mohapatra
2020-12-15 18:44 ` [RFC][PATCH v6 11/20] Compare loaded DSOs by file ID and check for DF_GNU_1_UNIQUE Vivek Das Mohapatra
2020-12-15 18:44 ` Vivek Das Mohapatra [this message]
2020-12-15 18:44 ` [RFC][PATCH v6 13/20] Use the DSO search helper to check for preloaded DT_GNU_UNIQUE DSOs Vivek Das Mohapatra
2020-12-15 18:44 ` [RFC][PATCH v6 14/20] When loading DSOs into alternate namespaces check for DT_GNU_UNIQUE Vivek Das Mohapatra
2020-12-15 18:44 ` [RFC][PATCH v6 15/20] Suppress audit calls when a (new) namespace is empty Vivek Das Mohapatra
2020-12-15 18:44 ` [RFC][PATCH v6 16/20] Suppress inter-namespace DSO sharing for audit libraries Vivek Das Mohapatra
2020-12-15 18:44 ` [RFC][PATCH v6 17/20] dlsym, dlvsym should be able to look up symbols via DSO proxies Vivek Das Mohapatra
2020-12-15 18:44 ` [RFC][PATCH v6 18/20] Add DT_GNU_FLAGS_1/DF_GNU_1_UNIQUE dynamic section+flag to glibc DSOs Vivek Das Mohapatra
2020-12-15 18:56 ` Samuel Thibault
2020-12-15 23:21 ` Vivek Das Mohapatra
2020-12-15 18:44 ` [RFC][PATCH v6 19/20] Add dlmopen / RTLD_SHARED tests Vivek Das Mohapatra
2020-12-15 18:45 ` [RFC][PATCH v6 20/20] Restore separate libc loading for the TLS/namespace storage test Vivek Das Mohapatra
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201215184500.25915-13-vivek@collabora.com \
--to=vivek@collabora.com \
--cc=libc-alpha@sourceware.org \
/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).