From patchwork Fri Oct 15 20:07:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 46295 X-Patchwork-Delegate: carlos@redhat.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CA6CA3857C7B for ; Fri, 15 Oct 2021 20:08:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CA6CA3857C7B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1634328491; bh=2n9JXVOcwhLwY0vq4qVu71Z1R2E4XYI+1TkiQC4nwo0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=e4vfwBCFsmePGOPQeCnTcMtPw6ScPseq4JnVvR+vI8Dgd1L/fg6K9yPzn2hMI3Wm2 0QgIDsPiye5SG610AzXRii7OVjQHW51AkxmJwKGE4c4kLUD6L9oEnYjIHAvG1U9SAc i5rpk6rBgcrgX3Gx205IOEs9smNjQCf1uG6+zgDo= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by sourceware.org (Postfix) with ESMTPS id CAA73385843D for ; Fri, 15 Oct 2021 20:07:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CAA73385843D Received: by mail-pj1-x1029.google.com with SMTP id om14so7945249pjb.5 for ; Fri, 15 Oct 2021 13:07:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=2n9JXVOcwhLwY0vq4qVu71Z1R2E4XYI+1TkiQC4nwo0=; b=RUfOfnJq+VmALqj1Fqx1fQEQ76a0SjYxMdeXJ4mC4z3JVk9/ssdpKaeBr7zde78gop +nu7T8yIb1kXFdmo8OUw5u6S0p4MZaNlxyF97Z3vmdafU/B6QNqn4t+PXiBd/mTAYteI aPsHo+hMhjstS3HVwj8pZLBIT0SBjN+mQPxrebGUjIKzxf8ivavPlq34bM6R/kcg5MH/ LnC3C/jehscf/A06swbSlBEOgN+F5ggffO/OOc6Y/mcrwFv5IKA4FeOj76ytGGqbCGSj 5Z1HXerwOFC3KeemDdrFArBRrY9Iw0uHpQmCm45KeMXXAa6C6ppeKLHobyWz6Y1FKJrs W3SQ== X-Gm-Message-State: AOAM530kO26sA5161PBOiQ5fXjTorWcXMEHEBP+RIDNNDvsKB1x0CEJq tHFBNXIL3xWcuLpCh579F4t24tPtwu0= X-Google-Smtp-Source: ABdhPJxLPqnNeuEAnlPXquvE1d1qFUVMXFd053yMAjT1vjv9eiTiGhNr/mPTBVpGzyK0NT4LHhCSXA== X-Received: by 2002:a17:903:183:b0:13f:1bc:e6bf with SMTP id z3-20020a170903018300b0013f01bce6bfmr12740778plg.47.1634328433669; Fri, 15 Oct 2021 13:07:13 -0700 (PDT) Received: from gnu-cfl-2.localdomain ([172.58.39.6]) by smtp.gmail.com with ESMTPSA id ng5sm5305640pjb.51.2021.10.15.13.07.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Oct 2021 13:07:13 -0700 (PDT) Received: from gnu-tgl-2.localdomain (gnu-tgl-2 [192.168.1.34]) by gnu-cfl-2.localdomain (Postfix) with ESMTPS id 8CAE1C02E1 for ; Fri, 15 Oct 2021 13:07:12 -0700 (PDT) Received: from gnu-tgl-2.. (localhost [IPv6:::1]) by gnu-tgl-2.localdomain (Postfix) with ESMTP id BDA57300553 for ; Fri, 15 Oct 2021 13:07:08 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH] Add and use link-test-modules-rpath-link [BZ #28455] Date: Fri, 15 Oct 2021 13:07:08 -0700 Message-Id: <20211015200708.3990016-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3032.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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 | 8 +++++++- elf/tst-global2.c | 28 ++++++++++++++++++++++++++++ elf/tst-globalmod2.c | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 elf/tst-global2.c create mode 100644 elf/tst-globalmod2.c diff --git a/Makeconfig b/Makeconfig index 2fa0884b4e..302fbf7e6b 100644 --- a/Makeconfig +++ b/Makeconfig @@ -569,8 +569,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 596fa68376..ac15671a0a 100644 --- a/Makerules +++ b/Makerules @@ -600,6 +600,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 b01ace2d5a..eeef71b82a 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -224,7 +224,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ tst-tls-ie tst-tls-ie-dlmopen argv0test \ tst-glibc-hwcaps tst-glibc-hwcaps-prepend tst-glibc-hwcaps-mask \ tst-tls20 tst-tls21 tst-dlmopen-dlerror tst-dlmopen-gethostbyname \ - tst-dl-is_dso tst-ro-dynamic + tst-dl-is_dso tst-ro-dynamic tst-global2 # reldep9 tests-internal += loadtest unload unload2 circleload1 \ neededtest neededtest2 neededtest3 neededtest4 \ @@ -365,6 +365,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ tst-tls20mod-bad tst-tls21mod tst-dlmopen-dlerror-mod \ tst-auxvalmod \ tst-dlmopen-gethostbyname-mod tst-ro-dynamic-mod \ + tst-globalmod2 \ # Most modules build with _ISOMAC defined, but those filtered out # depend on internal headers. @@ -1269,6 +1270,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..b17b69c42b --- /dev/null +++ b/elf/tst-global2.c @@ -0,0 +1,28 @@ +/* Test dlopening a shared library in a shared library built with + -Wl,--enable-new-dtags in glibc with --enable-hardcoded-path-in-tests. + 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 + . */ + +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..1d0cf3047e --- /dev/null +++ b/elf/tst-globalmod2.c @@ -0,0 +1,37 @@ +/* Test dlopening a shared library in a shared library built with + -Wl,--enable-new-dtags in glibc with --enable-hardcoded-path-in-tests. + 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 + . */ + +#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; +}