From: Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org>
To: Vivek Das Mohapatra <vivek@collabora.com>, libc-alpha@sourceware.org
Subject: Re: [RFC][PATCH v12 2/8] Abstract loaded-DSO search code into a helper function
Date: Mon, 9 Aug 2021 10:04:55 -0300 [thread overview]
Message-ID: <15007679-ba92-c43f-b960-40a872b2b0dd@linaro.org> (raw)
In-Reply-To: <20210708163255.812-3-vivek@collabora.com>
LGTM, but I think it should be merge it with next patch.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
On 08/07/2021 13:32, Vivek Das Mohapatra via Libc-alpha wrote:
> ---
> elf/dl-load.c | 38 ++++++++++++++++++++++++++++++++++++++
> sysdeps/generic/ldsodefs.h | 4 ++++
> 2 files changed, 42 insertions(+)
>
> diff --git a/elf/dl-load.c b/elf/dl-load.c
> index a08df001af..26680b7f68 100644
> --- a/elf/dl-load.c
> +++ b/elf/dl-load.c
> @@ -2027,6 +2027,44 @@ open_path (const char *name, size_t namelen, int mode,
> return -1;
> }
>
> +/* Search for a shared object in a given namespace. */
> +struct link_map *
> +_dl_find_dso (const char *name, Lmid_t nsid)
> +{
> + struct link_map *l;
> +
> + for (l = GL(dl_ns)[nsid]._ns_loaded; l != NULL; l = l->l_next)
> + {
> + /* 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;
> + }
> +
> + return NULL;
> +}
> +
> /* Map in the shared object file NAME. */
>
> struct link_map *
> diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
> index 176394de4d..44e7097712 100644
> --- a/sysdeps/generic/ldsodefs.h
> +++ b/sysdeps/generic/ldsodefs.h
> @@ -1287,6 +1287,10 @@ extern void _dl_show_scope (struct link_map *new, int from)
> extern struct link_map *_dl_find_dso_for_object (const ElfW(Addr) addr);
> rtld_hidden_proto (_dl_find_dso_for_object)
>
> +extern struct link_map *_dl_find_dso (const char *name, Lmid_t nsid);
> +rtld_hidden_proto (_dl_find_dso)
> +
> +
> /* Initialization which is normally done by the dynamic linker. */
> extern void _dl_non_dynamic_init (void)
> attribute_hidden;
>
next prev parent reply other threads:[~2021-08-09 13:05 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-08 16:32 [RFC][PATCH v12 0/8] Implementation of RTLD_SHARED for dlmopen Vivek Das Mohapatra via Libc-alpha
2021-07-08 16:32 ` [RFC][PATCH v12 1/8] Define a new dynamic section tag - DT_GNU_FLAGS_1 (bug 22745) Vivek Das Mohapatra via Libc-alpha
2021-08-09 12:27 ` Adhemerval Zanella via Libc-alpha
2021-07-08 16:32 ` [RFC][PATCH v12 2/8] Abstract loaded-DSO search code into a helper function Vivek Das Mohapatra via Libc-alpha
2021-08-09 13:04 ` Adhemerval Zanella via Libc-alpha [this message]
2021-07-08 16:32 ` [RFC][PATCH v12 3/8] Use the new DSO finder " Vivek Das Mohapatra via Libc-alpha
2021-08-09 12:59 ` Adhemerval Zanella via Libc-alpha
2021-07-08 16:32 ` [RFC][PATCH v12 4/8] Add DT_GNU_FLAGS_1/DF_GNU_1_UNIQUE to glibc DSOs (bug 22745) Vivek Das Mohapatra via Libc-alpha
2021-08-09 16:48 ` Adhemerval Zanella via Libc-alpha
2021-08-10 13:21 ` Adhemerval Zanella via Libc-alpha
2021-08-10 13:32 ` H.J. Lu via Libc-alpha
2021-07-08 16:32 ` [RFC][PATCH v12 5/8] Implement dlmopen RTLD_SHARED flag " Vivek Das Mohapatra via Libc-alpha
2021-08-09 19:07 ` Adhemerval Zanella via Libc-alpha
2021-08-09 20:24 ` Adhemerval Zanella via Libc-alpha
2021-08-09 20:30 ` Adhemerval Zanella via Libc-alpha
2021-07-08 16:32 ` [RFC][PATCH v12 6/8] Add dlmopen / RTLD_SHARED tests Vivek Das Mohapatra via Libc-alpha
2021-08-09 20:09 ` Adhemerval Zanella via Libc-alpha
2021-07-08 16:32 ` [RFC][PATCH v12 7/8] Restore separate libc loading for the TLS/namespace storage test Vivek Das Mohapatra via Libc-alpha
2021-08-09 19:08 ` Adhemerval Zanella via Libc-alpha
2021-07-08 16:32 ` [RFC][PATCH v12 8/8] Drop DT_GNU_FLAGS_1/DF_GNU_1_UNIQUE from the libpthread DSO Vivek Das Mohapatra via Libc-alpha
2021-08-09 20:10 ` Adhemerval Zanella via Libc-alpha
2021-08-09 21:24 ` Florian Weimer via Libc-alpha
2021-07-13 13:08 ` [External] : [RFC][PATCH v12 0/8] Implementation of RTLD_SHARED for dlmopen Alfonso Alfonso Peterssen via Libc-alpha
2021-08-09 20:34 ` Adhemerval Zanella 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=15007679-ba92-c43f-b960-40a872b2b0dd@linaro.org \
--to=libc-alpha@sourceware.org \
--cc=adhemerval.zanella@linaro.org \
--cc=vivek@collabora.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).