From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) by sourceware.org (Postfix) with ESMTPS id 6C9123851C2B for ; Thu, 8 Oct 2020 13:27:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6C9123851C2B Received: by mail-qt1-x842.google.com with SMTP id h12so3500109qtu.1 for ; Thu, 08 Oct 2020 06:27:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:references:from:autocrypt:subject:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Ss/dKwdG83vacLTupxN3MEd2RTC7TMNuHrexYGtkFIo=; b=KoqH0K6WalgwmgaCg2Ht4s/P5VTgoyorJLHeZoPDICwZLobGfXJ1bn0KXq31gcVZkO 1bTd7TivufEN5h06Jo31TuZ9IMIGvtT5cN0s+62dzPU5YV15rnCgcZlIz5L+qrSE2fx5 cSJEhTh727ikFRnEIcq9hngUT4YkKHgQaAHAJ9CumXG1i2oFKA6UebI3B7q3BTiFS6fT 7xH5E4oRtAQlK71i9oAg7JDEm+FwtyxUU2rUrLb7DsE20EADXZkq45xkouPD3Zvt9Mly zdQVQGy0ajAnWyiGngNY0wFmA2WSWrugJpqcfNPVpHHvOYH27eGJAnRDSi/npLYhCi9P FaPw== X-Gm-Message-State: AOAM531bhvK1Ja8R8OQtbfVvCuWrHM3eQfyoytuFwEWOLnSvZnsty7RS ZsKF41NGMqEEsEyg0TRh8TGDZ13tYEyHRg== X-Google-Smtp-Source: ABdhPJy22WhH4U6HjutdZ2lQt3iPx/ot+cLd/VhQMJ3PWL/Vs+yzC3chTgxUyxZv6nSbs4MyGXSOlw== X-Received: by 2002:aed:3e3a:: with SMTP id l55mr4622327qtf.19.1602163643550; Thu, 08 Oct 2020 06:27:23 -0700 (PDT) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id l19sm3791620qkk.99.2020.10.08.06.27.22 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 08 Oct 2020 06:27:23 -0700 (PDT) To: libc-alpha@sourceware.org References: From: Adhemerval Zanella Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Subject: Re: [PATCH 12/28] elf: Make __rtld_env_path_list and __rtld_search_dirs global variables Message-ID: <7a9df2eb-4055-9b60-56d0-4b72b5734a05@linaro.org> Date: Thu, 8 Oct 2020 10:27:20 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Oct 2020 13:27:26 -0000 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 > --- > 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.