From patchwork Fri Oct 15 20:07: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: 46294 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 AC5773857C7F for ; Fri, 15 Oct 2021 20:07:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AC5773857C7F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1634328449; bh=GfTJ/s5dqsHredyfqWmsFNkF9aF0EI/5gTG1I/yhVGU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=sI2jlfOpgyR0LvnEJgGz++IY2CD9yHeTqS2yNAzR7LP0QtJPooevhvCNp+fz7Nte5 9Th/FiMr84rqvRA3Cg/jc/5ULRuwkd3xY9j8b/obGOOYDfCSd2XHNgj2tmwZjQcj0Y ZA6SKY20gpHT6+PKG9U+ByyQz36KOicyJ76HNsJg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by sourceware.org (Postfix) with ESMTPS id C83C53858C60 for ; Fri, 15 Oct 2021 20:07:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C83C53858C60 Received: by mail-pg1-x535.google.com with SMTP id e7so9575338pgk.2 for ; Fri, 15 Oct 2021 13:07:07 -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=GfTJ/s5dqsHredyfqWmsFNkF9aF0EI/5gTG1I/yhVGU=; b=Ue+p9xJmsyKXJk9jEcgTu1/wfOIeAP36GFOKVkBbABu2aYSSM/P3NHy3XqAY2B1GS8 TL2vVgAXs9KOv/GbvNhvSwhuL2wgbMXiAcVEk3bYfa48cSyhQBO+sQOCoNqBN0MNrRbt it3mCuD5unzZOgFfKHTAqgMId0eYM+i28U4a3Wj6gslQ/gMFHbkQYK9byTQ3jIwrYWOS DSYhV7D5kfA1AlXkPNwnHhzrdPt3XvC7Lr0mmBWvAABipYpmDetjVtc12I+WbQJ3c75J DxsyHEf18Tz6aaBBuTCG8zZEdXxr2dUh40TRWEBTqFSuZLb8F+Pyfj9KgAiTsPxiCrmc DJSw== X-Gm-Message-State: AOAM533BLZE9ppOQwFxZmED8pwyPAJn8NCL4O4LxLcx2MH4l/KRQyhQ2 4IcqzZ6DeFWUPY168DDuNX+qMPzzMTQ= X-Google-Smtp-Source: ABdhPJwVQpDOn/w2aGTOqXb+2p6alwxqu6Op/WOYyOkGoPYx/EXwh6RKWfwgrigI42O2gkv1DYhC5Q== X-Received: by 2002:a63:258:: with SMTP id 85mr10653223pgc.11.1634328426643; Fri, 15 Oct 2021 13:07:06 -0700 (PDT) Received: from gnu-cfl-2.localdomain ([172.58.39.6]) by smtp.gmail.com with ESMTPSA id r8sm5479497pgp.30.2021.10.15.13.07.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Oct 2021 13:07:06 -0700 (PDT) Received: from gnu-tgl-2.localdomain (gnu-tgl-2 [192.168.1.34]) by gnu-cfl-2.localdomain (Postfix) with ESMTPS id 8CF6AC02E1 for ; Fri, 15 Oct 2021 13:07:04 -0700 (PDT) Received: from gnu-tgl-2.. (localhost [IPv6:::1]) by gnu-tgl-2.localdomain (Postfix) with ESMTP id 02233300553 for ; Fri, 15 Oct 2021 13:07:01 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH] elf: Also try DT_RUNPATH for internal dlopen [BZ #28455] Date: Fri, 15 Oct 2021 13:07:00 -0700 Message-Id: <20211015200700.3989961-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, 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. The glibc internal dlopen call should try the DT_RUNPATH of the executable. This partially fixes BZ #28455. --- elf/Makefile | 9 +++++++-- elf/dl-load.c | 30 ++++++++++++++++++++++-------- elf/tst-audit14a.c | 1 + nss/Makefile | 3 +++ nss/tst-nss-test1a.c | 1 + 5 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 elf/tst-audit14a.c create mode 100644 nss/tst-nss-test1a.c diff --git a/elf/Makefile b/elf/Makefile index eeef71b82a..739cd6c8ef 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -239,10 +239,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 @@ -1479,6 +1479,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) @@ -1505,6 +1507,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 18d3e8fe64..95f4d13c12 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -2162,15 +2162,29 @@ _dl_map_object (struct link_map *loader, const char *name, } /* If dynamically linked, try the DT_RPATH of the executable - itself. NB: we do this for lookups in any namespace. */ + itself. NB: we do this for lookups in any namespace. + + Also try DT_RUNPATH for glibc internal dlopen call. */ if (fd == -1 && !did_main_map - && main_map != NULL && main_map->l_type != lt_loaded - && cache_rpath (main_map, &main_map->l_rpath_dirs, DT_RPATH, - "RPATH")) - fd = open_path (name, namelen, mode, - &main_map->l_rpath_dirs, - &realname, &fb, loader ?: main_map, LA_SER_RUNPATH, - &found_other_class); + && main_map != NULL && main_map->l_type != lt_loaded) + { + struct r_search_path_struct l_rpath_dirs; + struct r_search_path_struct *l_rpath_dirs_p = NULL; + if (cache_rpath (main_map, &main_map->l_rpath_dirs, + DT_RPATH, "RPATH")) + l_rpath_dirs_p = &main_map->l_rpath_dirs; + else if (__glibc_unlikely (mode & __RTLD_DLOPEN)) + { + l_rpath_dirs.dirs = NULL; + if (cache_rpath (main_map, &l_rpath_dirs, DT_RUNPATH, + "RUNPATH")) + l_rpath_dirs_p = &l_rpath_dirs; + } + if (l_rpath_dirs_p) + fd = open_path (name, namelen, mode, l_rpath_dirs_p, + &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" diff --git a/nss/Makefile b/nss/Makefile index bccf9f2806..cd99e04732 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -58,6 +58,7 @@ tests-static = tst-field tests-internal = tst-field tests = test-netdb test-digits-dots tst-nss-getpwent bug17079 \ tst-nss-test1 \ + tst-nss-test1a \ tst-nss-test2 \ tst-nss-test4 \ tst-nss-test5 @@ -189,3 +190,5 @@ endif $(objpfx)tst-nss-files-alias-leak.out: $(objpfx)/libnss_files.so $(objpfx)tst-nss-files-alias-truncated.out: $(objpfx)/libnss_files.so + +LDFLAGS-tst-nss-test1a = -Wl,--enable-new-dtags diff --git a/nss/tst-nss-test1a.c b/nss/tst-nss-test1a.c new file mode 100644 index 0000000000..f1428259c8 --- /dev/null +++ b/nss/tst-nss-test1a.c @@ -0,0 +1 @@ +#include "tst-nss-test1.c"