From patchwork Fri Dec 3 03:21:54 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: 48451 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 CF6AF385AC28 for ; Fri, 3 Dec 2021 03:22:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CF6AF385AC28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1638501756; bh=3rkCbucNosDKOXDcOyJvioKNGMeYzRH5008KJ64KKBs=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=p27sl9trD0VmMv13pv9EyeEnlgcKlYIvQx/d7geptfrfsK45nZvtD851iudwpn/I6 c0mTvVwBrUZbBm6IMW68q4i7NUJ3u4tTtoAttqXFWN0JMegvxG1YKAdyS1mtrabjoq vfXQb5xtyDeHPLw4A0TS4S6PmGSN50GPGl6P9Aak= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by sourceware.org (Postfix) with ESMTPS id 8EEAD3857810 for ; Fri, 3 Dec 2021 03:21:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8EEAD3857810 Received: by mail-pl1-x62f.google.com with SMTP id y8so1170168plg.1 for ; Thu, 02 Dec 2021 19:21:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3rkCbucNosDKOXDcOyJvioKNGMeYzRH5008KJ64KKBs=; b=1hGsUG/FYyee5c8ik8RkZfC4Eaa9VZPQm9FmlhAV9eLORHDyBQdbcZVHVx3mi61ckY WqWm9DPtwQMDb1kQwBys0nOfu97Tuk2C4WtCwq9j719NCN0o82065olMS90xbLEHecbG IwVnzkFI2cevM93cWrJj2CEF0uryx70JnVAS3hFuXYAF5/bs8Y+9e9xtnxEbdDGIT2zl eUilKRfmFPRznKVKunHaPmK6pFMWZmyyhjxo0dezkjS9J/UsFajDkkevxt4e+jaEnQQa sjqVWSpQ1Oh0Vk1K+tTiZscPbsl5aZJTl0GWFrw329Pn3FUFtdyXjV3pFFntgQ09iYc2 JCiw== X-Gm-Message-State: AOAM532GotgUeJZ/6VGEHAf6z/NJkRYxUE4OvSjsC4drQrcRc0ZMYYBj soc7GLddzazYSbHFMVKS6kgz5ZQbMI4= X-Google-Smtp-Source: ABdhPJw9WB7wjonTBycSnwWbdUs5VNSer0wOzuTNHoQLJxALXoBxJSbsmFg/3dLDkCGd6zxcI6NGwQ== X-Received: by 2002:a17:90a:4894:: with SMTP id b20mr10712954pjh.121.1638501715696; Thu, 02 Dec 2021 19:21:55 -0800 (PST) Received: from gnu-tgl-3.localdomain (71-222-78-46.lsv2.qwest.net. [71.222.78.46]) by smtp.gmail.com with ESMTPSA id f185sm1196094pfg.39.2021.12.02.19.21.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Dec 2021 19:21:55 -0800 (PST) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id AD15EC0537; Thu, 2 Dec 2021 19:21:54 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2] Add and use link-test-modules-rpath-link [BZ #28455] Date: Thu, 2 Dec 2021 19:21:54 -0800 Message-Id: <20211203032154.1609837-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3031.4 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 | 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 3fa2f13003..2e2b6dbdf9 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 8db0ca1296..7afba30039 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 4723c159cb..03b04df131 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -231,6 +231,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ tst-tls20 tst-tls21 tst-dlmopen-dlerror tst-dlmopen-gethostbyname \ tst-dl-is_dso tst-ro-dynamic \ tst-audit18 \ + tst-global2 \ # reldep9 tests-internal += loadtest unload unload2 circleload1 \ neededtest neededtest2 neededtest3 neededtest4 \ @@ -373,6 +374,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ tst-dlmopen-gethostbyname-mod tst-ro-dynamic-mod \ tst-auditmod18 \ tst-audit18mod \ + tst-globalmod2 \ # Most modules build with _ISOMAC defined, but those filtered out # depend on internal headers. @@ -1309,6 +1311,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; +}