From patchwork Wed Dec 8 15:24:59 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: 48637 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 EC5DC3858C60 for ; Wed, 8 Dec 2021 15:27:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EC5DC3858C60 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1638977275; bh=bDFhvLa+wUUblcOVxOSf7fjhaL6CLJNyjsFtrGR3tvA=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=AumLsd9LJY031oeHnXTczebiKki7nIjidq+28owxoBcaHygNLxw7G5BLKh3ZJ1xg4 IWEFNulOW48RcZRl9nO9b3w0/nZ7Vf1zXDzY3aD7EC8wByYUf+OVaHx1ezK8j+woiM oyZuVWljvJAFRdcmLzzE7HAPUIyKrZqve0fWKinw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by sourceware.org (Postfix) with ESMTPS id 354083858408 for ; Wed, 8 Dec 2021 15:25:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 354083858408 Received: by mail-pg1-x534.google.com with SMTP id 137so2355928pgg.3 for ; Wed, 08 Dec 2021 07:25:04 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=bDFhvLa+wUUblcOVxOSf7fjhaL6CLJNyjsFtrGR3tvA=; b=IDfMYjNmzbkukXOvo5pKGGdkKCQkDwjwlvTjEvyAdbV+tak4xynWAdVj6JYn5/5TN9 skKtAE/IKgloAeq3cn6muoNYinOgseBw2rJ5Gkq9INJFx+55NN0fzfY0HYFh2ZlPkwfm JO+pvIS1n1JX5UL9yYOYdXyi/Vfk5aG45PpXbl1G/uWyMvtJHY8B4QUhvD0wJHbCP/w9 AzqpjYvu/3LcgaHigVmVWq/jGje3Phd2qj8b2zfn+pnH6hW4qcmJnczlht3CbNWsrPBI wUz6BGSCFCua/1LFNj2RqaCeU+A/JSAOMjZpI8DpOa2x12L/AucEACZRKqFsf9C2xRsI Gz2w== X-Gm-Message-State: AOAM530+dCo+4ru4smtTGgwXM6ST3idLJQ3l2LFM/q5karKqGqSTtvIw +ZCpq8P/6XWtpQvMOx8dVW3dzczFaC4= X-Google-Smtp-Source: ABdhPJz/qSdZ58ZDa+Xsy+6QuEaSmo2XAs4adV5ajNRcYvZv3LCF/lP1X2lEsCU4lvudNoE+PH95mg== X-Received: by 2002:a63:1018:: with SMTP id f24mr16914627pgl.20.1638977103194; Wed, 08 Dec 2021 07:25:03 -0800 (PST) Received: from gnu-cfl-2.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id r16sm3008181pgk.45.2021.12.08.07.25.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Dec 2021 07:25:02 -0800 (PST) Received: from gnu-cfl-2.. (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id A73781A0912; Wed, 8 Dec 2021 07:25:01 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v3 1/3] Add and use link-test-modules-rpath-link [BZ #28455] Date: Wed, 8 Dec 2021 07:24:59 -0800 Message-Id: <20211208152501.1483087-2-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211208152501.1483087-1-hjl.tools@gmail.com> References: <20211208152501.1483087-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3029.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_BARRACUDACENTRAL, 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 ef36008673..4b5bdcb08e 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -232,6 +232,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ tst-dl-is_dso tst-ro-dynamic \ tst-audit18 \ tst-rtld-run-static \ + tst-global2 \ # reldep9 tests-internal += loadtest unload unload2 circleload1 \ neededtest neededtest2 neededtest3 neededtest4 \ @@ -374,6 +375,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. @@ -1310,6 +1312,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; +} From patchwork Wed Dec 8 15:25:00 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: 48636 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 965F63858434 for ; Wed, 8 Dec 2021 15:27:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 965F63858434 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1638977232; bh=FIbgY1eyGhG4Y3IbyBuqQE9eyLEZNcW/QSGfW49nURw=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=CFlmht6T2nPw0qpPPW953dLIRLGVoT8O10d8OZAt96IdwsXZa1FL5z2fDD7jaZnV5 DaXec2CuSOmqJ7Z6xCvZ4wglWOs74lnX7vK3KWLWERw58LnYETxQGl1MHqtg8sWlYu rk846LEJchn4/H4yKmXoa1CAzYYNyjBC6zFvt+MY= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by sourceware.org (Postfix) with ESMTPS id 0FDD3385842C for ; Wed, 8 Dec 2021 15:25:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0FDD3385842C Received: by mail-pj1-x1035.google.com with SMTP id cq22-20020a17090af99600b001a9550a17a5so4589793pjb.2 for ; Wed, 08 Dec 2021 07:25:05 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=FIbgY1eyGhG4Y3IbyBuqQE9eyLEZNcW/QSGfW49nURw=; b=kt3gAGYnOeFyFICbAMQN6T4z/JVjABIYofpyBFzrSOGYL8/azF5sUOMbX8gMBGGkXq FuvtHg9WN1VAfqkX5Yy58KxsvHboOH+JeXA1n7J0iPSAymDPKwugQzQ+gJ5ZfL9BuB+D um/YuJyY9plKqe6Jq+3LuJ+JitODLBGrJQjXCG3L3WjrFuXhZZZ0Sfe4e/Vhco03Sgpm RAwzq12Jpn2JG1lZvVRlGBa7xM58xkK0hWXWtAu1eapQE8i4Kn/SG5H53iL97ghg/8J8 z8pi9hed2SfdSvHPcoYBiuj5x7lvNogrGINdE40h01Ia6MX7W2pA3QC+kLGHammKPpgg JtTg== X-Gm-Message-State: AOAM533dL78lpKlSvSU/QQsfd5iey1GQZUf23FsAvx1SsmE8bham6avo uP4Lvxgbz/AYqBBZoeN472F3ZveziLI= X-Google-Smtp-Source: ABdhPJzghfGlxQethkeSMqtKTAzt7W7JqyeeZ9Mn0lqCNTHvCS2bXXj3Lt4HwLknTyymv8J3K64HiQ== X-Received: by 2002:a17:90b:4d09:: with SMTP id mw9mr7989503pjb.238.1638977104182; Wed, 08 Dec 2021 07:25:04 -0800 (PST) Received: from gnu-cfl-2.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id o17sm2668553pgb.42.2021.12.08.07.25.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Dec 2021 07:25:02 -0800 (PST) Received: from gnu-cfl-2.. (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id A86D71A096B; Wed, 8 Dec 2021 07:25:01 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v3 2/3] Disable DT_RUNPATH on NSS tests [BZ #28455] Date: Wed, 8 Dec 2021 07:25:00 -0800 Message-Id: <20211208152501.1483087-3-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211208152501.1483087-1-hjl.tools@gmail.com> References: <20211208152501.1483087-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3029.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, 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" The glibc internal NSS functions should always load NSS modules from the system. For testing purpose, disable DT_RUNPATH on NSS tests so that the glibc internal NSS functions can load testing NSS modules via DT_RPATH. This partially fixes BZ #28455. Reviewed-by: Carlos O'Donell --- nss/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nss/Makefile b/nss/Makefile index bccf9f2806..757446f80a 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -189,3 +189,11 @@ endif $(objpfx)tst-nss-files-alias-leak.out: $(objpfx)/libnss_files.so $(objpfx)tst-nss-files-alias-truncated.out: $(objpfx)/libnss_files.so + +# Disable DT_RUNPATH on NSS tests so that the glibc internal NSS +# functions can load testing NSS modules via DT_RPATH. +LDFLAGS-tst-nss-test1 = -Wl,--disable-new-dtags +LDFLAGS-tst-nss-test2 = -Wl,--disable-new-dtags +LDFLAGS-tst-nss-test3 = -Wl,--disable-new-dtags +LDFLAGS-tst-nss-test4 = -Wl,--disable-new-dtags +LDFLAGS-tst-nss-test5 = -Wl,--disable-new-dtags From patchwork Wed Dec 8 15:25:01 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: 48634 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 465493858424 for ; Wed, 8 Dec 2021 15:25:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 465493858424 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1638977148; bh=dj6BZwJtsn88wSw3e8NVMVCyda3/SP01yfFXJ1If01U=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=MWzi6ChZDcgCO/ntBPaKS93zGvDmNoBpuYwixfjWuvbs7nv7D/u9g5VkEbU0zoGAm HZv0B08CFnKkaFC69kocw/PgHbyfANClX7LqWdjSkvQcUGHFnYNr4HPcc8xt9uYGDe ahuhJc/o8hEJndqaDvU6MKfkTRcR5TJZYBgLYIZc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by sourceware.org (Postfix) with ESMTPS id 08D953858438 for ; Wed, 8 Dec 2021 15:25:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 08D953858438 Received: by mail-pj1-x102c.google.com with SMTP id h24so2162193pjq.2 for ; Wed, 08 Dec 2021 07:25:03 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=dj6BZwJtsn88wSw3e8NVMVCyda3/SP01yfFXJ1If01U=; b=TlSJoIUfRwguJ8nd8/qlP0Ar1FhS/S7MC+PqOItEnbbEpwip4ZtWfgstEnI3PskMAW hl+nz8IcLYNit2i51ASAznMYujETrr48ZD/0kmXsNTDn+LMi2qMmSZtu5tXrykMj0cJF zpCjrFF8fLfr1G/QWUS9EmO1aarYaUU93PGjo6xvCYhypc3zNvrnr9J29ZcE2f4BMPjg wk+baSUkr1+AMTxphf1r3WR2oAu3FzwcD2iXdCIF7pb1iTLU9FrE3g+wmLWxvtaJnkLS ZkE0D4mxu+tL0IBrBS8wLK6AqhbFS5I8fZdytcV0pSH+c+7Nm4+7+D9BAT1Uju0Pf5Ly Asbw== X-Gm-Message-State: AOAM531baccPEzJt1QddikQmmR/SLQiTzI4jyTrSF5tvC9g5KzoDuQQG IIMEmFtWNNZKC1KbCQxMiQE4vHFTEbw= X-Google-Smtp-Source: ABdhPJxiMzgRLK8ClCFo41WzpfKG+kQrD/NSgbT1YUJQS5c6QyLsGZZD6bw9hRouVRBLAzBmkDi4SQ== X-Received: by 2002:a17:90b:1c02:: with SMTP id oc2mr8006804pjb.65.1638977103023; Wed, 08 Dec 2021 07:25:03 -0800 (PST) Received: from gnu-cfl-2.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id k19sm4049524pff.20.2021.12.08.07.25.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Dec 2021 07:25:02 -0800 (PST) Received: from gnu-cfl-2.. (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id B31D51A09B1; Wed, 8 Dec 2021 07:25:01 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v3 3/3] elf: Also try DT_RUNPATH for LD_AUDIT dlopen [BZ #28455] Date: Wed, 8 Dec 2021 07:25:01 -0800 Message-Id: <20211208152501.1483087-4-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211208152501.1483087-1-hjl.tools@gmail.com> References: <20211208152501.1483087-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3029.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, 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. Update the glibc LD_AUDIT dlopen call to try the DT_RUNPATH entry of the executable. This partially fixes BZ #28455. --- elf/Makefile | 9 +++++++-- elf/dl-load.c | 15 +++++++++++++++ elf/tst-audit14a.c | 1 + 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 elf/tst-audit14a.c diff --git a/elf/Makefile b/elf/Makefile index 4b5bdcb08e..aa6b24d790 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -247,10 +247,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 @@ -1521,6 +1521,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) @@ -1547,6 +1549,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 bf8957e73c..1f424ea7c8 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -2175,6 +2175,21 @@ _dl_map_object (struct link_map *loader, const char *name, &main_map->l_rpath_dirs, &realname, &fb, loader ?: main_map, LA_SER_RUNPATH, &found_other_class); + + /* Also try DT_RUNPATH in the executable for glibc internal + dlopen call. */ + if (__glibc_unlikely (mode & __RTLD_AUDIT) + && fd == -1 && !did_main_map + && main_map != NULL && main_map->l_type != lt_loaded) + { + struct r_search_path_struct l_rpath_dirs; + l_rpath_dirs.dirs = NULL; + if (cache_rpath (main_map, &l_rpath_dirs, + DT_RUNPATH, "RUNPATH")) + fd = open_path (name, namelen, mode, &l_rpath_dirs, + &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"