From: "Vivek Das Mohapatra" <vivek@collabora.com>
To: libc-alpha@sourceware.org
Subject: [RFC][PATCH v11 3/7] Use the new DSO finder helper function
Date: Wed, 9 Jun 2021 18:16:14 +0100 [thread overview]
Message-ID: <20210609171618.20674-4-vivek@collabora.com> (raw)
In-Reply-To: <20210609171618.20674-1-vivek@collabora.com>
---
elf/dl-load.c | 28 +++-------------------------
1 file changed, 3 insertions(+), 25 deletions(-)
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 579ec92b9b..93a4aaf138 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -2082,32 +2082,10 @@ _dl_map_object (struct link_map *loader, const char *name,
assert (nsid < GL(dl_nns));
/* 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. */
return l;
}
--
2.20.1
next prev parent reply other threads:[~2021-06-09 17:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 17:16 [RFC][PATCH v11 0/7] Implementation of RTLD_SHARED for dlmopen Vivek Das Mohapatra
2021-06-09 17:16 ` [RFC][PATCH v11 1/7] Define a new dynamic section tag - DT_GNU_FLAGS_1 (bug 22745) Vivek Das Mohapatra
2021-06-09 17:16 ` [RFC][PATCH v11 2/7] Abstract loaded-DSO search code into a helper function Vivek Das Mohapatra
2021-06-09 17:16 ` Vivek Das Mohapatra [this message]
2021-06-09 17:16 ` [RFC][PATCH v11 4/7] Add DT_GNU_FLAGS_1/DF_GNU_1_UNIQUE to glibc DSOs (bug 22745) Vivek Das Mohapatra
2021-06-09 17:16 ` [RFC][PATCH v11 5/7] Implement dlmopen RTLD_SHARED flag " Vivek Das Mohapatra
2021-06-09 17:16 ` [RFC][PATCH v11 6/7] Add dlmopen / RTLD_SHARED tests Vivek Das Mohapatra
2021-06-09 17:16 ` [RFC][PATCH v11 7/7] Restore separate libc loading for the TLS/namespace storage test Vivek Das Mohapatra
2021-06-09 18:29 ` [RFC][PATCH v11 0/7] Implementation of RTLD_SHARED for dlmopen Florian Weimer
2021-06-09 22:50 ` Vivek Das Mohapatra
2021-06-16 13:08 ` [External] : " Alfonso Alfonso Peterssen
2021-06-20 23:18 ` 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=20210609171618.20674-4-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).