[RFC,v10,3/7] Use the new DSO finder helper function
Commit Message
---
elf/dl-load.c | 28 +++-------------------------
1 file changed, 3 insertions(+), 25 deletions(-)
Comments
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
On 22/03/2021 12:41, Vivek Das Mohapatra via Libc-alpha wrote:
> ---
> 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 3ffb83cb6a..f2dbe45703 100644
> --- a/elf/dl-load.c
> +++ b/elf/dl-load.c
> @@ -2062,32 +2062,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;
> }
>
>
@@ -2062,32 +2062,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;
}