From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) by sourceware.org (Postfix) with ESMTPS id BE6A3385480F for ; Fri, 19 Feb 2021 19:50:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BE6A3385480F Received: by mail-qt1-x82c.google.com with SMTP id o30so4460907qtd.12 for ; Fri, 19 Feb 2021 11:50:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:autocrypt:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Pgx8+Cw5FCaJBnQkUj2Djj41wva3+YQYjI4QsgLHkY4=; b=j8bTPiqss7N2INzeqCxlvbDPeYgkvLZfnTaBQTu3MVMkES5Ct7WgSHH3CBZ5owldUa +KtNmRiNf8rALVMMp+aUa6AqoIr7lluqgyYF2g4c0MHnGLAhuS2N55uL8OmpEItsIlJA 6afRGLNHuZaNc+U0lu0mSkaGOg/8CTFXqAxaAkWVz2tKjzVJu9m+3mwAIlmlZxyFgBBR XPBYuTiJLt3AdHp0fq8YLVDhVhdQHi3ONQrca0YJlBSFJxlO0oDa47Tp5gOKfzB8ef5U kUHICIu7zsOyJ6T6O/+Taud1LnYdhWitKN+cBkJnoCRBFWabUBeKcQlXEKYkmh25D3zZ fTNA== X-Gm-Message-State: AOAM531BlAdWeM1+f213y44Cgs0AJCQpG+n05ngBjruZfPw3o1P1Xdv1 ygknGnaqIyW9fOfSK4Dfeq03FH2kuuKetA== X-Google-Smtp-Source: ABdhPJwTQNwCDRCprxlzVSRi0foZD34DYDMeb6vPFeVCvEks1ZKAxNl9YuNdKlFJzO0ASaAx32pU3g== X-Received: by 2002:a05:622a:248:: with SMTP id c8mr10258627qtx.122.1613764242333; Fri, 19 Feb 2021 11:50:42 -0800 (PST) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id e14sm5959293qte.18.2021.02.19.11.50.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Feb 2021 11:50:42 -0800 (PST) Subject: Re: [RFC][PATCH v8 12/20] Use the new DSO finder helper function since we have it From: Adhemerval Zanella To: libc-alpha@sourceware.org, Vivek Das Mohapatra References: <20210209171839.7911-1-vivek@collabora.com> <20210209171839.7911-13-vivek@collabora.com> <176085fa-d11b-dfe5-805a-d1627861e298@linaro.org> Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: <349cc59a-d78a-5cc6-0bdd-a6b4b1fb72e2@linaro.org> Date: Fri, 19 Feb 2021 16:50:39 -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: <176085fa-d11b-dfe5-805a-d1627861e298@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.6 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: Fri, 19 Feb 2021 19:50:44 -0000 On 19/02/2021 11:39, Adhemerval Zanella wrote: > > > On 09/02/2021 14:18, Vivek Das Mohapatra via Libc-alpha wrote: >> --- >> elf/dl-load.c | 43 +++++++++++++++++-------------------------- >> 1 file changed, 17 insertions(+), 26 deletions(-) >> >> diff --git a/elf/dl-load.c b/elf/dl-load.c >> index 780bca99e8..13ac2053b8 100644 >> --- a/elf/dl-load.c >> +++ b/elf/dl-load.c >> @@ -2133,35 +2133,26 @@ _dl_map_object (struct link_map *loader, const char *name, >> #endif >> >> /* 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. */ >> +#ifdef SHARED >> + /* If we are trying to load a DF_GNU_1_UNIQUE flagged DSO which WAS >> + already opened in the target NS but with RTLD_ISOLATE so it WAS NOT >> + created as a proxy we need to error out since we cannot satisfy the >> + DF_GNU_1_UNIQUE is-equivalent-to RTLD_SHARED semantics. */ >> + if (!(mode & RTLD_ISOLATE) && Also the new RTLD_ISOLATE flag is only defined later in this set. >> + (l->l_ns != LM_ID_BASE) && >> + (l->l_gnu_flags_1 & DF_GNU_1_UNIQUE) && >> + !l->l_proxy) >> + { >> + _dl_signal_error (EEXIST, name, NULL, >> + N_("object cannot be demoted to a proxy")); >> + } >> +#endif >> return l; > > I think this patch should reorganized along with the previous, where > first you refactor the code to use find_dso and *then* add the > required l_proxy change in a subsequent patch. > > (There are other patch organization that I think should be changed, > I will get back to them once I finish reviewing the set) > >> } >> - > > I usually avoid such spurious change. > >> /* Display information if we are debugging. */ >> if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES) >> && loader != NULL) >>