From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.2 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id E33971F4B4 for ; Wed, 7 Oct 2020 16:39:48 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B14CB384400A; Wed, 7 Oct 2020 16:39:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B14CB384400A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1602088787; bh=WQVSxih1ezMGWpcqRmk9JDdJuKMmGFY0MNWST8tgKhw=; h=To:References:Subject:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=EPxdzz8HQHEC/oxHo+y8HYjUj6b7NUur9/gMfLg+0FwRvhIRcd5YM6BqMcjQYfRas P8uFlYLNE2JhqwEeWRZDGH1rtCh7NGw3Nw/q3tVz+ogcRXw99/f0ev1RBixUy5+A0f HLxJQQaVCUEgaH8a9N9s5LGzF+4Rd6KHV1pA37BY= Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by sourceware.org (Postfix) with ESMTPS id 6A19D3858D35 for ; Wed, 7 Oct 2020 16:39:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6A19D3858D35 Received: by mail-qk1-x744.google.com with SMTP id d20so3506404qka.5 for ; Wed, 07 Oct 2020 09:39:45 -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=WQVSxih1ezMGWpcqRmk9JDdJuKMmGFY0MNWST8tgKhw=; b=a2G8OhdaaKB0oreWrMkqs2GAreCx//Aa05DqGScI6s2T1QMLuFPuN8NOIxeBCZj/wT 8Mcwi3VvKvHUML9n6fHf03KOv7klHXg8LhQeQv/9dCXfeM2hgzPGkfJL6CiqbLCiX7K8 o/MI6EIPGekLmFdjRbeE62OmJEeUVrY6p7naGHK6pVpuIp846ZJtuM/5E0u97xauldkC LbUOZJlcYUr+z2+7Du4MzBCZtC2Pw+muNgDQwgvrKEYxMidm3Wf6QJQIns9cCdPajPsa 1krsEpW/v+Hitomsq5nZdLtNDXYcI77JEfZ0V0wqtTHBrvibwVdK3jBFpfuMRZgbTC62 7G2w== X-Gm-Message-State: AOAM5304Z5biISY9CPk7Zc9hjv94hG+LLVBQHAkNmvASRViy1uTn/ioh IXgMI1nuk5C+3DekGMdGWM3o+Dz/f8y9FA== X-Google-Smtp-Source: ABdhPJyWvYWo8RDfq1BjYgvtKAMby4CwjuPW9Vk9yMPOgvmj1IgBzrg8tguC/qy0MaSJD8TjRdAfCg== X-Received: by 2002:ae9:e004:: with SMTP id m4mr3720688qkk.165.1602088784487; Wed, 07 Oct 2020 09:39:44 -0700 (PDT) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id r190sm1845534qkf.101.2020.10.07.09.39.43 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 07 Oct 2020 09:39:43 -0700 (PDT) To: libc-alpha@sourceware.org References: Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Subject: Re: [PATCH 06/28] elf: Record whether paths come from LD_LIBRARY_PATH or --library-path Message-ID: <31804d39-0208-adb1-cbcd-963fbba64c9f@linaro.org> Date: Wed, 7 Oct 2020 13:39:41 -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-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: , From: Adhemerval Zanella via Libc-alpha Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" On 01/10/2020 13:32, Florian Weimer via Libc-alpha wrote: > This allows more precise diagnostics. I haven't check the rest of the patchset to see how this information would be used, but one option might to define the source with an enumeration instead of an string (to fully use a type and avoid wrong usage). In either case, patch looks good thanks. Reviewed-by: Adhemerval Zanella > --- > elf/dl-load.c | 4 ++-- > elf/dl-main.h | 5 ++++- > elf/dl-support.c | 2 +- > elf/rtld.c | 3 +++ > sysdeps/generic/ldsodefs.h | 6 ++++-- > 5 files changed, 14 insertions(+), 6 deletions(-) > > diff --git a/elf/dl-load.c b/elf/dl-load.c > index 5ba117d597..5fbb8c9ad4 100644 > --- a/elf/dl-load.c > +++ b/elf/dl-load.c > @@ -682,7 +682,7 @@ cache_rpath (struct link_map *l, > > > void > -_dl_init_paths (const char *llp) > +_dl_init_paths (const char *llp, const char *source) > { > size_t idx; > const char *strp; > @@ -820,7 +820,7 @@ _dl_init_paths (const char *llp) > } > > (void) fillin_rpath (llp_tmp, env_path_list.dirs, ":;", > - "LD_LIBRARY_PATH", NULL, l); > + source, NULL, l); > > if (env_path_list.dirs[0] == NULL) > { Ok. > diff --git a/elf/dl-main.h b/elf/dl-main.h > index 681f366871..68dd27d0d7 100644 > --- a/elf/dl-main.h > +++ b/elf/dl-main.h > @@ -71,6 +71,9 @@ struct dl_main_state > /* The library search path. */ > const char *library_path; > > + /* Where library_path comes from. LD_LIBRARY_PATH or --library. */ > + const char *library_path_source; > + > /* The list preloaded objects from LD_PRELOAD. */ > const char *preloadlist; > Ok. > @@ -91,7 +94,7 @@ struct dl_main_state > static inline void > call_init_paths (const struct dl_main_state *state) > { > - _dl_init_paths (state->library_path); > + _dl_init_paths (state->library_path, state->library_path_source); > } > > /* Print ld.so usage information and exit. */ Ok. > diff --git a/elf/dl-support.c b/elf/dl-support.c > index 7704c101c5..afbc94df54 100644 > --- a/elf/dl-support.c > +++ b/elf/dl-support.c > @@ -323,7 +323,7 @@ _dl_non_dynamic_init (void) > > /* Initialize the data structures for the search paths for shared > objects. */ > - _dl_init_paths (getenv ("LD_LIBRARY_PATH")); > + _dl_init_paths (getenv ("LD_LIBRARY_PATH"), "LD_LIBRARY_PATH"); > > /* Remember the last search directory added at startup. */ > _dl_init_all_dirs = GL(dl_all_dirs); Ok. > diff --git a/elf/rtld.c b/elf/rtld.c > index f3e1791e2f..d11fe22b83 100644 > --- a/elf/rtld.c > +++ b/elf/rtld.c > @@ -286,6 +286,7 @@ dl_main_state_init (struct dl_main_state *state) > { > audit_list_init (&state->audit_list); > state->library_path = NULL; > + state->library_path_source = NULL; > state->preloadlist = NULL; > state->preloadarg = NULL; > state->mode = normal; > @@ -1203,6 +1204,7 @@ dl_main (const ElfW(Phdr) *phdr, > && _dl_argc > 2) > { > state.library_path = _dl_argv[2]; > + state.library_path_source = "--library_path"; > > _dl_skip_args += 2; > _dl_argc -= 2; > @@ -2655,6 +2657,7 @@ process_envvars (struct dl_main_state *state) > && memcmp (envline, "LIBRARY_PATH", 12) == 0) > { > state->library_path = &envline[13]; > + state->library_path_source = "LD_LIBRARY_PATH"; > break; > } > Ok. > diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h > index 7cb1fccc80..510a2f6841 100644 > --- a/sysdeps/generic/ldsodefs.h > +++ b/sysdeps/generic/ldsodefs.h > @@ -1046,8 +1046,10 @@ rtld_hidden_proto (_dl_debug_state) > extern struct r_debug *_dl_debug_initialize (ElfW(Addr) ldbase, Lmid_t ns) > attribute_hidden; > > -/* Initialize the basic data structure for the search paths. */ > -extern void _dl_init_paths (const char *library_path) attribute_hidden; > +/* Initialize the basic data structure for the search paths. SOURCE > + is either "LD_LIBRARY_PATH" or "--library-path". */ > +extern void _dl_init_paths (const char *library_path, const char *source) > + attribute_hidden; > > /* Gather the information needed to install the profiling tables and start > the timers. */ > Ok.