From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: Re: [PATCH 12/28] elf: Make __rtld_env_path_list and __rtld_search_dirs global variables
Date: Thu, 8 Oct 2020 10:27:20 -0300 [thread overview]
Message-ID: <7a9df2eb-4055-9b60-56d0-4b72b5734a05@linaro.org> (raw)
In-Reply-To: <c937c21fab2ceee33e1e60cdab22684d6d76ffd0.1601569371.git.fweimer@redhat.com>
On 01/10/2020 13:32, Florian Weimer via Libc-alpha wrote:
> They have been renamed from env_path_list and rtld_search_dirs to
> avoid linknamespace issues.
>
> This change will allow future use these variables in diagnostics.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> elf/dl-load.c | 53 +++++++++++++++++++++++++-------------------------
> include/link.h | 4 ++++
> 2 files changed, 31 insertions(+), 26 deletions(-)
>
> diff --git a/elf/dl-load.c b/elf/dl-load.c
> index 5fbb8c9ad4..0c8fa72c4d 100644
> --- a/elf/dl-load.c
> +++ b/elf/dl-load.c
> @@ -98,7 +98,7 @@ int __stack_prot attribute_hidden attribute_relro
>
>
> /* This is the decomposed LD_LIBRARY_PATH search path. */
> -static struct r_search_path_struct env_path_list attribute_relro;
> +struct r_search_path_struct __rtld_env_path_list attribute_relro;
>
> /* List of the hardware capabilities we might end up using. */
> #ifdef SHARED
Ok.
> @@ -442,7 +442,7 @@ add_name_to_object (struct link_map *l, const char *name)
> }
>
> /* Standard search directories. */
> -static struct r_search_path_struct rtld_search_dirs attribute_relro;
> +struct r_search_path_struct __rtld_search_dirs attribute_relro;
>
> static size_t max_dirnamelen;
>
Ok.
> @@ -702,9 +702,9 @@ _dl_init_paths (const char *llp, const char *source)
> #endif
>
> /* First set up the rest of the default search directory entries. */
> - aelem = rtld_search_dirs.dirs = (struct r_search_path_elem **)
> + aelem = __rtld_search_dirs.dirs = (struct r_search_path_elem **)
> malloc ((nsystem_dirs_len + 1) * sizeof (struct r_search_path_elem *));
> - if (rtld_search_dirs.dirs == NULL)
> + if (__rtld_search_dirs.dirs == NULL)
> {
> errstring = N_("cannot create search path array");
> signal_error:
Ok.
> @@ -715,16 +715,17 @@ _dl_init_paths (const char *llp, const char *source)
> + ncapstr * sizeof (enum r_dir_status))
> / sizeof (struct r_search_path_elem));
>
> - rtld_search_dirs.dirs[0] = malloc (nsystem_dirs_len * round_size
> - * sizeof (*rtld_search_dirs.dirs[0]));
> - if (rtld_search_dirs.dirs[0] == NULL)
> + __rtld_search_dirs.dirs[0]
> + = malloc (nsystem_dirs_len * round_size
> + * sizeof (*__rtld_search_dirs.dirs[0]));
> + if (__rtld_search_dirs.dirs[0] == NULL)
> {
> errstring = N_("cannot create cache for search path");
> goto signal_error;
> }
>
> - rtld_search_dirs.malloced = 0;
> - pelem = GL(dl_all_dirs) = rtld_search_dirs.dirs[0];
> + __rtld_search_dirs.malloced = 0;
> + pelem = GL(dl_all_dirs) = __rtld_search_dirs.dirs[0];
> strp = system_dirs;
> idx = 0;
>
Ok.
> @@ -811,27 +812,27 @@ _dl_init_paths (const char *llp, const char *source)
> if (*cp == ':' || *cp == ';')
> ++nllp;
>
> - env_path_list.dirs = (struct r_search_path_elem **)
> + __rtld_env_path_list.dirs = (struct r_search_path_elem **)
> malloc ((nllp + 1) * sizeof (struct r_search_path_elem *));
> - if (env_path_list.dirs == NULL)
> + if (__rtld_env_path_list.dirs == NULL)
> {
> errstring = N_("cannot create cache for search path");
> goto signal_error;
> }
>
> - (void) fillin_rpath (llp_tmp, env_path_list.dirs, ":;",
> + (void) fillin_rpath (llp_tmp, __rtld_env_path_list.dirs, ":;",
> source, NULL, l);
Maybe remove the the (void)?
>
> - if (env_path_list.dirs[0] == NULL)
> + if (__rtld_env_path_list.dirs[0] == NULL)
> {
> - free (env_path_list.dirs);
> - env_path_list.dirs = (void *) -1;
> + free (__rtld_env_path_list.dirs);
> + __rtld_env_path_list.dirs = (void *) -1;
> }
>
> - env_path_list.malloced = 0;
> + __rtld_env_path_list.malloced = 0;
> }
> else
> - env_path_list.dirs = (void *) -1;
> + __rtld_env_path_list.dirs = (void *) -1;
> }
>
>
Ok.
> @@ -1996,9 +1997,9 @@ open_path (const char *name, size_t namelen, int mode,
> if (sps->malloced)
> free (sps->dirs);
>
> - /* rtld_search_dirs and env_path_list are attribute_relro, therefore
> - avoid writing into it. */
> - if (sps != &rtld_search_dirs && sps != &env_path_list)
> + /* __rtld_search_dirs and __rtld_env_path_list are
> + attribute_relro, therefore avoid writing to them. */
> + if (sps != &__rtld_search_dirs && sps != &__rtld_env_path_list)
> sps->dirs = (void *) -1;
> }
>
Ok.
> @@ -2146,8 +2147,8 @@ _dl_map_object (struct link_map *loader, const char *name,
> }
>
> /* Try the LD_LIBRARY_PATH environment variable. */
> - if (fd == -1 && env_path_list.dirs != (void *) -1)
> - fd = open_path (name, namelen, mode, &env_path_list,
> + if (fd == -1 && __rtld_env_path_list.dirs != (void *) -1)
> + fd = open_path (name, namelen, mode, &__rtld_env_path_list,
> &realname, &fb,
> loader ?: GL(dl_ns)[LM_ID_BASE]._ns_loaded,
> LA_SER_LIBPATH, &found_other_class);
Ok.
> @@ -2236,8 +2237,8 @@ _dl_map_object (struct link_map *loader, const char *name,
> if (fd == -1
> && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
> || __glibc_likely (!(l->l_flags_1 & DF_1_NODEFLIB)))
> - && rtld_search_dirs.dirs != (void *) -1)
> - fd = open_path (name, namelen, mode, &rtld_search_dirs,
> + && __rtld_search_dirs.dirs != (void *) -1)
> + fd = open_path (name, namelen, mode, &__rtld_search_dirs,
> &realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
>
> /* Add another newline when we are tracing the library loading. */
Ok.
> @@ -2405,7 +2406,7 @@ _dl_rtld_di_serinfo (struct link_map *loader, Dl_serinfo *si, bool counting)
> }
>
> /* Try the LD_LIBRARY_PATH environment variable. */
> - add_path (&p, &env_path_list, XXX_ENV);
> + add_path (&p, &__rtld_env_path_list, XXX_ENV);
>
> /* Look at the RUNPATH information for this binary. */
> if (cache_rpath (loader, &loader->l_runpath_dirs, DT_RUNPATH, "RUNPATH"))
Ok.
> @@ -2417,7 +2418,7 @@ _dl_rtld_di_serinfo (struct link_map *loader, Dl_serinfo *si, bool counting)
>
> /* Finally, try the default path. */
> if (!(loader->l_flags_1 & DF_1_NODEFLIB))
> - add_path (&p, &rtld_search_dirs, XXX_default);
> + add_path (&p, &__rtld_search_dirs, XXX_default);
>
> if (counting)
> /* Count the struct size before the string area, which we didn't
Ok.
> diff --git a/include/link.h b/include/link.h
> index aea268439c..d4714bc28d 100644
> --- a/include/link.h
> +++ b/include/link.h
> @@ -79,6 +79,10 @@ struct r_search_path_struct
> int malloced;
> };
>
> +/* Search path information computed by _dl_init_paths. */
> +extern struct r_search_path_struct __rtld_search_dirs attribute_hidden;
> +extern struct r_search_path_struct __rtld_env_path_list attribute_hidden;
> +
> /* Structure describing a loaded shared object. The `l_next' and `l_prev'
> members form a chain of all the shared objects loaded at startup.
>
>
Ok.
next prev parent reply other threads:[~2020-10-08 13:27 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 16:31 [PATCH 00/28] glibc-hwcaps support Florian Weimer
2020-10-01 16:31 ` [PATCH 01/28] elf: Do not search HWCAP subdirectories in statically linked binaries Florian Weimer
2020-10-01 18:22 ` Adhemerval Zanella
2020-10-01 18:24 ` Carlos O'Donell
2020-10-01 18:29 ` Adhemerval Zanella
2020-10-01 20:24 ` Carlos O'Donell
2020-10-01 16:31 ` [PATCH 02/28] elf: Implement __rtld_malloc_is_full Florian Weimer
2020-10-01 18:23 ` Adhemerval Zanella
2020-10-08 9:44 ` Florian Weimer
2020-10-01 16:31 ` [PATCH 03/28] elf: Implement _dl_write Florian Weimer
2020-10-05 19:46 ` Adhemerval Zanella
2020-10-01 16:31 ` [PATCH 04/28] elf: Extract command-line/environment variables state from rtld.c Florian Weimer
2020-10-06 20:45 ` Adhemerval Zanella
2020-10-08 11:32 ` Florian Weimer
2020-10-01 16:32 ` [PATCH 05/28] elf: Move ld.so error/help output to _dl_usage Florian Weimer
2020-10-06 21:06 ` Adhemerval Zanella
2020-10-08 12:19 ` Florian Weimer
2020-10-01 16:32 ` [PATCH 06/28] elf: Record whether paths come from LD_LIBRARY_PATH or --library-path Florian Weimer
2020-10-07 16:39 ` Adhemerval Zanella
2020-10-07 16:49 ` Florian Weimer
2020-10-01 16:32 ` [PATCH 07/28] elf: Implement ld.so --help Florian Weimer
2020-10-07 17:16 ` Adhemerval Zanella
2020-10-08 13:13 ` Florian Weimer
2020-10-01 16:32 ` [PATCH 08/28] elf: Implement ld.so --version Florian Weimer
2020-10-07 18:36 ` Adhemerval Zanella
2020-10-07 18:38 ` Adhemerval Zanella
2020-10-08 13:37 ` Florian Weimer
2020-10-01 16:32 ` [PATCH 09/28] scripts/update-copyrights: Update csu/version.c, elf/dl-usage.c Florian Weimer
2020-10-07 18:41 ` Adhemerval Zanella
2020-10-01 16:32 ` [PATCH 10/28] elf: Use the term "program interpreter" in the ld.so help message Florian Weimer
2020-10-07 21:08 ` Adhemerval Zanella
2020-10-08 14:08 ` Florian Weimer
2020-10-01 16:32 ` [PATCH 11/28] elf: Print the full name of the dynamic loader " Florian Weimer
2020-10-08 12:38 ` Adhemerval Zanella
2020-10-01 16:32 ` [PATCH 12/28] elf: Make __rtld_env_path_list and __rtld_search_dirs global variables Florian Weimer
2020-10-08 13:27 ` Adhemerval Zanella [this message]
2020-10-01 16:32 ` [PATCH 13/28] elf: Add library search path information to ld.so --help Florian Weimer
2020-10-08 16:22 ` Adhemerval Zanella
2020-10-01 16:33 ` [PATCH 14/28] elf: Enhance ld.so --help to print HWCAP subdirectories Florian Weimer
2020-10-08 16:27 ` Adhemerval Zanella
2020-10-09 8:18 ` Florian Weimer
2020-10-09 13:49 ` Matheus Castanho
2020-10-09 17:08 ` Florian Weimer
2020-10-09 17:12 ` Florian Weimer
2020-10-09 18:54 ` Matheus Castanho
2020-10-12 9:47 ` Florian Weimer
2020-10-01 16:33 ` [PATCH 15/28] elf: Do not pass GLRO(dl_platform), GLRO(dl_platformlen) to _dl_important_hwcaps Florian Weimer
2020-10-08 18:04 ` Adhemerval Zanella
2020-10-01 16:33 ` [PATCH 16/28] elf: Add glibc-hwcaps support for LD_LIBRARY_PATH Florian Weimer
2020-10-08 10:13 ` Szabolcs Nagy
2020-10-09 9:08 ` Florian Weimer
2020-10-09 10:50 ` Szabolcs Nagy
2020-10-09 10:55 ` Florian Weimer
2020-10-09 11:03 ` Szabolcs Nagy
2020-10-08 23:16 ` Paul A. Clarke
2020-10-09 8:56 ` Florian Weimer
2020-10-09 13:19 ` Adhemerval Zanella
2020-10-12 11:54 ` Florian Weimer
2020-10-01 16:33 ` [PATCH 17/28] x86_64: Add glibc-hwcaps support Florian Weimer
2020-10-01 16:33 ` [PATCH 18/28] powerpc64le: " Florian Weimer
2020-10-01 18:56 ` Paul A. Clarke
2020-10-05 9:47 ` Florian Weimer
2020-10-05 19:15 ` Paul A. Clarke
2020-10-06 12:20 ` Florian Weimer
2020-10-06 17:45 ` Paul A. Clarke
2020-10-09 9:06 ` Florian Weimer
2020-10-01 16:33 ` [PATCH 19/28] s390x: Add " Florian Weimer
2020-10-01 16:33 ` [PATCH 20/28] aarch64: " Florian Weimer
2020-10-14 13:46 ` Adhemerval Zanella
2020-10-14 14:08 ` Florian Weimer
2020-10-14 14:15 ` Adhemerval Zanella
2020-10-14 14:37 ` Szabolcs Nagy
2020-10-14 14:43 ` Adhemerval Zanella
2020-10-14 15:13 ` Florian Weimer
2020-10-14 14:44 ` Florian Weimer
2020-10-14 15:09 ` Szabolcs Nagy
2020-10-01 16:33 ` [PATCH 21/28] elf: Add endianness markup to ld.so.cache Florian Weimer
2020-10-14 14:07 ` Adhemerval Zanella
2020-10-01 16:33 ` [PATCH 22/28] elf: Add extension mechanism " Florian Weimer
2020-10-15 17:52 ` Adhemerval Zanella
2020-10-30 12:22 ` Florian Weimer
2020-11-03 12:45 ` Adhemerval Zanella
2020-11-03 15:30 ` Florian Weimer
2020-10-01 16:34 ` [PATCH 23/28] elf: Unify old and new format cache handling code in ld.so Florian Weimer
2020-10-16 14:37 ` Adhemerval Zanella
2020-10-30 13:22 ` Florian Weimer
2020-11-03 13:02 ` Adhemerval Zanella
2020-10-01 16:34 ` [PATCH 24/28] elf: Implement a string table for ldconfig, with tail merging Florian Weimer
2020-10-20 14:25 ` Adhemerval Zanella
2020-10-30 17:08 ` Florian Weimer
2020-11-03 13:05 ` Adhemerval Zanella
2020-11-03 15:29 ` Florian Weimer
2020-10-01 16:34 ` [PATCH 25/28] elf: Implement tail merging of strings in ldconfig Florian Weimer
2020-10-22 21:08 ` Adhemerval Zanella
2020-10-30 17:36 ` Florian Weimer
2020-10-01 16:34 ` [PATCH 26/28] elf: In ldconfig, extract the new_sub_entry function from search_dir Florian Weimer
2020-10-27 13:15 ` Adhemerval Zanella
2020-10-01 16:34 ` [PATCH 27/28] elf: Process glibc-hwcaps subdirectories in ldconfig Florian Weimer
2020-10-27 17:28 ` Adhemerval Zanella
2020-11-04 11:57 ` Florian Weimer
2020-10-01 16:34 ` [PATCH 28/28] elf: Add glibc-hwcaps subdirectory support to ld.so cache processing Florian Weimer
2020-10-01 16:50 ` [PATCH 00/28] glibc-hwcaps support H.J. Lu
2020-10-01 16:54 ` Florian Weimer
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=7a9df2eb-4055-9b60-56d0-4b72b5734a05@linaro.org \
--to=adhemerval.zanella@linaro.org \
--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).