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-ASN: AS3215 2.6.0.0/16 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, RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 1EC7A1F953 for ; Mon, 29 Nov 2021 12:51:02 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2C0393835C11 for ; Mon, 29 Nov 2021 12:51:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2C0393835C11 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1638190261; bh=u1nd0BhHWT84ygVEOlXVlDK3FPF7zDhk6OJ+VDzl6IU=; h=References:In-Reply-To:Date:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=LgANj0ucTb+bR3gaGhNTWW+PxbiG0QBLWYS3ToL1/ZPIyQrHk+MWMiodQyQLADjDy 82z/YgHF+69rhX02kc91d9zyze0aF5627MVOOVdlmxwprFCisux42w+5187MPcIdLk pILew7HXH/PgWruMa10gMUQxrSq9orT5szX1m+LI= Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id B54873857C6E for ; Mon, 29 Nov 2021 12:50:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B54873857C6E Received: by mail-pf1-x42a.google.com with SMTP id r130so16787160pfc.1 for ; Mon, 29 Nov 2021 04:50:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=u1nd0BhHWT84ygVEOlXVlDK3FPF7zDhk6OJ+VDzl6IU=; b=xz08b5FOo1W+7prDzv3Rf0uGYO/amrsI+7hoSzIOWwMyZx6X7sU6x4M9uSMJIjuKo7 F7UoWzkgVU4kz/vflFf3kT+PaFP161fcPtxu/Qe5npverDpGysVY7ukDpxjPofm5xPW3 UP+KjKyptiRCYdZCGTWimUlQfPyxRDeUmLG49hOx2fFs+paRrtK9/3t5NTve2LTUw6Qo Jj8k/g6WyCZpcWOFHbdANvT2lCa+QPNm+3kG//CwOvNROOKk6r8lm+MZio8lIC1Egm8e eR3qP7j7OkpHQ779guuov9zOQxOLGik7+V9TmMoVFB+dGIz4c4hyKSGIHRDDvEjSU/jx x8Gg== X-Gm-Message-State: AOAM530HmNh8+zF+w3whfJm+c1oMKadax8OsdB9Yvz4g9wtQeRJIh5HH HqtXbWAsPsfjJzcDwxLzQQtdynt1dIO9OS/cLqIbw0Mm X-Google-Smtp-Source: ABdhPJwX5u4LeTRPuw0SHACdmGTltxOszQf5DIM1sbtM4WVFkmNrvaat782GjKFoDZRrzKEszkce7p6BHRIUZwyvoP8= X-Received: by 2002:a63:60c:: with SMTP id 12mr12195143pgg.125.1638190239241; Mon, 29 Nov 2021 04:50:39 -0800 (PST) MIME-Version: 1.0 References: <20211015200700.3989961-1-hjl.tools@gmail.com> In-Reply-To: <20211015200700.3989961-1-hjl.tools@gmail.com> Date: Mon, 29 Nov 2021 04:50:03 -0800 Message-ID: Subject: PING^1 [PATCH] elf: Also try DT_RUNPATH for internal dlopen [BZ #28455] To: GNU C Library Content-Type: text/plain; charset="UTF-8" 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: "H.J. Lu via Libc-alpha" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces+e=80x24.org@sourceware.org Sender: "Libc-alpha" On Fri, Oct 15, 2021 at 1:07 PM H.J. Lu wrote: > > DT_RUNPATH is only used to find the immediate dependencies of the > executable or shared object containing the DT_RUNPATH entry. The > glibc internal dlopen call should try the DT_RUNPATH of the executable. > This partially fixes BZ #28455. > --- > elf/Makefile | 9 +++++++-- > elf/dl-load.c | 30 ++++++++++++++++++++++-------- > elf/tst-audit14a.c | 1 + > nss/Makefile | 3 +++ > nss/tst-nss-test1a.c | 1 + > 5 files changed, 34 insertions(+), 10 deletions(-) > create mode 100644 elf/tst-audit14a.c > create mode 100644 nss/tst-nss-test1a.c > > diff --git a/elf/Makefile b/elf/Makefile > index eeef71b82a..739cd6c8ef 100644 > --- a/elf/Makefile > +++ b/elf/Makefile > @@ -239,10 +239,10 @@ ifneq ($(selinux-enabled),1) > tests-execstack-yes = tst-execstack tst-execstack-needed tst-execstack-prog > endif > ifeq ($(have-depaudit),yes) > -tests += tst-audit14 tst-audit15 tst-audit16 > +tests += tst-audit14 tst-audit15 tst-audit16 tst-audit14a > ifeq ($(run-built-tests),yes) > tests-special += $(objpfx)tst-audit14-cmp.out $(objpfx)tst-audit15-cmp.out \ > - $(objpfx)tst-audit16-cmp.out > + $(objpfx)tst-audit16-cmp.out $(objpfx)tst-audit14a-cmp.out > endif > endif > endif > @@ -1479,6 +1479,8 @@ tst-auditmany-ENV = \ > LDFLAGS-tst-audit14 = -Wl,--audit=tst-auditlogmod-1.so > $(objpfx)tst-auditlogmod-1.so: $(libsupport) > $(objpfx)tst-audit14.out: $(objpfx)tst-auditlogmod-1.so > +LDFLAGS-tst-audit14a = -Wl,--audit=tst-auditlogmod-1.so,--enable-new-dtags > +$(objpfx)tst-audit14a.out: $(objpfx)tst-auditlogmod-1.so > LDFLAGS-tst-audit15 = \ > -Wl,--audit=tst-auditlogmod-1.so,--depaudit=tst-auditlogmod-2.so > $(objpfx)tst-auditlogmod-2.so: $(libsupport) > @@ -1505,6 +1507,9 @@ tst-audit17-ENV = LD_AUDIT=$(objpfx)tst-auditmod17.so > $(objpfx)tst-audit14-cmp.out: tst-audit14.exp $(objpfx)tst-audit14.out > cmp $^ > $@; \ > $(evaluate-test) > +$(objpfx)tst-audit14a-cmp.out: tst-audit14.exp $(objpfx)tst-audit14a.out > + cmp $^ > $@; \ > + $(evaluate-test) > $(objpfx)tst-audit15-cmp.out: tst-audit15.exp $(objpfx)tst-audit15.out > cmp $^ > $@; \ > $(evaluate-test) > diff --git a/elf/dl-load.c b/elf/dl-load.c > index 18d3e8fe64..95f4d13c12 100644 > --- a/elf/dl-load.c > +++ b/elf/dl-load.c > @@ -2162,15 +2162,29 @@ _dl_map_object (struct link_map *loader, const char *name, > } > > /* If dynamically linked, try the DT_RPATH of the executable > - itself. NB: we do this for lookups in any namespace. */ > + itself. NB: we do this for lookups in any namespace. > + > + Also try DT_RUNPATH for glibc internal dlopen call. */ > if (fd == -1 && !did_main_map > - && main_map != NULL && main_map->l_type != lt_loaded > - && cache_rpath (main_map, &main_map->l_rpath_dirs, DT_RPATH, > - "RPATH")) > - fd = open_path (name, namelen, mode, > - &main_map->l_rpath_dirs, > - &realname, &fb, loader ?: main_map, LA_SER_RUNPATH, > - &found_other_class); > + && main_map != NULL && main_map->l_type != lt_loaded) > + { > + struct r_search_path_struct l_rpath_dirs; > + struct r_search_path_struct *l_rpath_dirs_p = NULL; > + if (cache_rpath (main_map, &main_map->l_rpath_dirs, > + DT_RPATH, "RPATH")) > + l_rpath_dirs_p = &main_map->l_rpath_dirs; > + else if (__glibc_unlikely (mode & __RTLD_DLOPEN)) > + { > + l_rpath_dirs.dirs = NULL; > + if (cache_rpath (main_map, &l_rpath_dirs, DT_RUNPATH, > + "RUNPATH")) > + l_rpath_dirs_p = &l_rpath_dirs; > + } > + if (l_rpath_dirs_p) > + fd = open_path (name, namelen, mode, l_rpath_dirs_p, > + &realname, &fb, loader ?: main_map, > + LA_SER_RUNPATH, &found_other_class); > + } > } > > /* Try the LD_LIBRARY_PATH environment variable. */ > diff --git a/elf/tst-audit14a.c b/elf/tst-audit14a.c > new file mode 100644 > index 0000000000..c6232eacf2 > --- /dev/null > +++ b/elf/tst-audit14a.c > @@ -0,0 +1 @@ > +#include "tst-audit14.c" > diff --git a/nss/Makefile b/nss/Makefile > index bccf9f2806..cd99e04732 100644 > --- a/nss/Makefile > +++ b/nss/Makefile > @@ -58,6 +58,7 @@ tests-static = tst-field > tests-internal = tst-field > tests = test-netdb test-digits-dots tst-nss-getpwent bug17079 \ > tst-nss-test1 \ > + tst-nss-test1a \ > tst-nss-test2 \ > tst-nss-test4 \ > tst-nss-test5 > @@ -189,3 +190,5 @@ endif > > $(objpfx)tst-nss-files-alias-leak.out: $(objpfx)/libnss_files.so > $(objpfx)tst-nss-files-alias-truncated.out: $(objpfx)/libnss_files.so > + > +LDFLAGS-tst-nss-test1a = -Wl,--enable-new-dtags > diff --git a/nss/tst-nss-test1a.c b/nss/tst-nss-test1a.c > new file mode 100644 > index 0000000000..f1428259c8 > --- /dev/null > +++ b/nss/tst-nss-test1a.c > @@ -0,0 +1 @@ > +#include "tst-nss-test1.c" > -- > 2.31.1 > PING. -- H.J.