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"