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 B85AA1F852 for ; Fri, 21 Jan 2022 12:26:41 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D9618385840D for ; Fri, 21 Jan 2022 12:26:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D9618385840D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1642767999; bh=r3vvsGODAZd/V6j8riZUFh0ek6xsZyiy0fOq0HxVkhw=; 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=khGkKzF7QfDx+Sq5lles+ZPUR0wXJGer6/N6XnYc5+r/jR5t8vLDkgBW+fBMw+zmy RgcNFTuYxPPHEpbZoMSap4QvioBHOQEqu9bOb0K0wdEfTlKHpwu1LjIv5p4nTBz13a iYmtmdbDOF44H1p2YYM43h+38XvRDiiBQC6MAKh0= Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by sourceware.org (Postfix) with ESMTPS id CEB273858C2C for ; Fri, 21 Jan 2022 12:26:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CEB273858C2C Received: by mail-pj1-x1036.google.com with SMTP id my12-20020a17090b4c8c00b001b528ba1cd7so4041968pjb.1 for ; Fri, 21 Jan 2022 04:26:18 -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=r3vvsGODAZd/V6j8riZUFh0ek6xsZyiy0fOq0HxVkhw=; b=XSHKoql0DZgFQa5wpoZR9CMNvuMYReAmg7KoRBHl67t18QacIMpyvWkQJknCwJwpkF 0jtZpL/Knscs2AmemL4po+plMf81pxxtGuBW7V+LCvGO8ku4CLY9ZATyaYBqf/ZV0VzU MQpmbBvzuveGjIXB+rzbKOf0u/JwT+GlvE4oXnNYE2N6+/A/VjraIt5jfj1YH+5/5l/X qIB8WKfujSqvq6z6+NAaHfYhB4aJNHhXsLdsyXSuNIljZy7IMSjpn02SHnd+Ap3U+U0b /l2lgyalUalhT6o9UVA1tBEah0ZdfMsN7ebKHTx/z2BQhsRzGjrN4KiiFUJPqajGKmOU a+Kg== X-Gm-Message-State: AOAM533D245tGBQ+KI6qowjuyF2/tz+ZVfd/tltHRjereR/T2K4jVgHi /QBMALJ1XUMCGgcCRg4PmG8l2er9iMkCmq8tFhQX1+saReo= X-Google-Smtp-Source: ABdhPJw1GmEU98xIdjyY8JR0fKmQx+egZTS93DRT3cKV+/2W6OYeVLoujnIxgBLXEBa8K6A61saNW/P0hghNC/t/BYY= X-Received: by 2002:a17:902:e54d:b0:14b:1a2b:e842 with SMTP id n13-20020a170902e54d00b0014b1a2be842mr3501703plf.102.1642767977625; Fri, 21 Jan 2022 04:26:17 -0800 (PST) MIME-Version: 1.0 References: <20220104140009.1578867-1-hjl.tools@gmail.com> In-Reply-To: <20220104140009.1578867-1-hjl.tools@gmail.com> Date: Fri, 21 Jan 2022 04:25:41 -0800 Message-ID: Subject: PING^1 [PATCH] Add and use link-test-modules-rpath-link [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 Tue, Jan 4, 2022 at 6:00 AM 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: > > 1. Define link-test-modules-rpath-link if $(build-hardcoded-path-in-tests) > is yes. > 2. Use $(link-test-modules-rpath-link) in build-module-helper so that > test modules can dlopen modules with DT_RUNPATH. > 3. Add a test to show why link-test-modules-rpath-link is needed. > > This partially fixes BZ #28455. > --- > Makeconfig | 2 ++ > Makerules | 1 + > elf/Makefile | 7 +++++++ > elf/tst-global2.c | 32 ++++++++++++++++++++++++++++++++ > elf/tst-globalmod2.c | 41 +++++++++++++++++++++++++++++++++++++++++ > 5 files changed, 83 insertions(+) > create mode 100644 elf/tst-global2.c > create mode 100644 elf/tst-globalmod2.c > > diff --git a/Makeconfig b/Makeconfig > index 06f1cca320..02a0afb9c2 100644 > --- a/Makeconfig > +++ b/Makeconfig > @@ -575,8 +575,10 @@ link-libc-rpath-link = -Wl,-rpath-link=$(rpath-link) > # build-hardcoded-path-in-tests. > ifeq (yes,$(build-hardcoded-path-in-tests)) > link-libc-tests-rpath-link = $(link-libc-rpath) > +link-test-modules-rpath-link = $(link-libc-rpath) > else > link-libc-tests-rpath-link = $(link-libc-rpath-link) > +link-test-modules-rpath-link = > endif # build-hardcoded-path-in-tests > > link-libc-between-gnulib = $(common-objpfx)libc.so$(libc.so-version) \ > diff --git a/Makerules b/Makerules > index 9a56cbdead..37c29758ee 100644 > --- a/Makerules > +++ b/Makerules > @@ -591,6 +591,7 @@ $(LINK.o) -shared -static-libgcc $(sysdep-LDFLAGS) $(rtld-LDFLAGS) \ > $(if $($(@F)-no-z-defs)$(no-z-defs),,-Wl,-z,defs) \ > -B$(csu-objpfx) $(load-map-file) \ > $(LDFLAGS.so) $(LDFLAGS-$(@F:%.so=%).so) \ > + $(link-test-modules-rpath-link) \ > -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) > endef > > diff --git a/elf/Makefile b/elf/Makefile > index 8eb7e6e5d9..bbca0b21bc 100644 > --- a/elf/Makefile > +++ b/elf/Makefile > @@ -279,6 +279,7 @@ tests += \ > tst-glibc-hwcaps-mask \ > tst-glibc-hwcaps-prepend \ > tst-global1 \ > + tst-global2 \ > tst-initfinilazyfail \ > tst-initorder \ > tst-initorder2 \ > @@ -535,6 +536,7 @@ modules-names = \ > tst-filterobj-filtee \ > tst-filterobj-flt \ > tst-finilazyfailmod \ > + tst-globalmod2 \ > tst-initlazyfailmod \ > tst-initorder2a \ > tst-initorder2b \ > @@ -1624,6 +1626,11 @@ tst-audit8-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so > > $(objpfx)tst-global1.out: $(objpfx)testobj6.so $(objpfx)testobj2.so > > +$(objpfx)tst-global2: $(objpfx)tst-globalmod2.so > +$(objpfx)tst-global2.out: $(objpfx)reldepmod1.so $(objpfx)reldepmod4.so > +LDFLAGS-tst-global2 = -Wl,--enable-new-dtags > +LDFLAGS-tst-globalmod2.so = -Wl,--enable-new-dtags > + > $(objpfx)order2.out: $(objpfx)order2mod1.so $(objpfx)order2mod2.so > $(objpfx)order2-cmp.out: $(objpfx)order2.out > (echo "12345" | cmp $< -) > $@; \ > diff --git a/elf/tst-global2.c b/elf/tst-global2.c > new file mode 100644 > index 0000000000..e929f526f4 > --- /dev/null > +++ b/elf/tst-global2.c > @@ -0,0 +1,32 @@ > +/* Test BZ #28455. > + Copyright (C) 2021 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +/* In glibc configured with --enable-hardcoded-path-in-tests, a test > + program built with -Wl,--enable-new-dtags, which adds DT_RUNPATH, > + instead of DT_RPATH, can call a function in a shared library, which > + dlopens another shared library. */ > + > +extern int test (void); > + > +static int > +do_test (void) > +{ > + return test (); > +} > + > +#include > diff --git a/elf/tst-globalmod2.c b/elf/tst-globalmod2.c > new file mode 100644 > index 0000000000..6fd70a72a8 > --- /dev/null > +++ b/elf/tst-globalmod2.c > @@ -0,0 +1,41 @@ > +/* Test BZ #28455. > + Copyright (C) 2021 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +/* In glibc configured with --enable-hardcoded-path-in-tests, a test > + program built with -Wl,--enable-new-dtags, which adds DT_RUNPATH, > + instead of DT_RPATH, can call a function in a shared library, which > + dlopens another shared library. */ > + > +#include > +#include > +#include > + > +extern int test (void); > + > +int > +test (void) > +{ > + (void) dlopen ("reldepmod4.so", RTLD_LAZY | RTLD_GLOBAL); > + if (dlsym (RTLD_DEFAULT, "call_me") != NULL) > + { > + puts ("found \"call_me\""); > + return EXIT_SUCCESS; > + } > + puts ("didn't find \"call_me\""); > + return EXIT_FAILURE; > +} > -- > 2.33.1 > PING https://patchwork.sourceware.org/project/glibc/patch/20220104140009.1578867-1-hjl.tools@gmail.com/ -- H.J.