From patchwork Wed Nov 15 13:38:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 79942 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 95C0F3858C30 for ; Wed, 15 Nov 2023 13:38:45 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by sourceware.org (Postfix) with ESMTPS id 37F253858C98 for ; Wed, 15 Nov 2023 13:38:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 37F253858C98 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 37F253858C98 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::1032 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700055513; cv=none; b=lhIWhTjW4unXObxBLffCxiPiG+hrDX22r4GcP4tauS+AZe1XKbqYd2GqQxRnwkdDZAEGnl3Q0mC6KbP2amrpeSJG+fW/6aJWn6xKJ3hx079PXdh10R+V+EOsSTGhh8KGon8+lO34ZcShP0PnShsG+LY9jUUK2GR7GPbJKcERr/g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700055513; c=relaxed/simple; bh=nxd+OwCI9lMg4ObtGwKFIAjNk1VCwv25/EkTXvioS50=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=w2ApAlG7f3sL8BH76uYZrzt8OPuI9ily8CtTnP8WbrIO822OooW1TKzXzhD2LyPOIJhvRtmD5v3Bjju4ZkkM9RzC8uBUvh8kA57Zg2BmIl6fhuoBo2cDft3NN8qkmaErcO33llq60zvcCFRv5EGoBL/X0eM36Fi7ojyDGYaUcC0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-2809b4d648bso438158a91.2 for ; Wed, 15 Nov 2023 05:38:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700055510; x=1700660310; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+266PoX/DdNbeeOo2WCuE3EdL9HuWPmIk9/UqUBBbx0=; b=x9d5XU8cZ9eslF1hwq0KvM9enJXTsp3weLPbkGlUZrWn63JHQyGqxcxqnqlJ3PjUmg YyLce4l+7R79MZ1h8NAugVl5noe2tfRJnQ/WeGHS1EW1B6XRuv01haK6S1zBR2ZM150U s0tG611vUTSzI1NC9FxerTjkRPR1bgRazIoRAB3S7KBoJHeW7uSFYXTyFay6yOihu8cO 1Sjr/evQ0YaZiugALN4VmZ35L0emy4MDG1Joz+enJ19ybTgOgHCk/Qc1ISSAQYWzqPox h5BnZ9jH+uWCy/OwLYNbJVAIjigIQHLck9n/2TQCQQUkbPo8eyD1NfDB+6tvBnMv3xIy 4LJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700055510; x=1700660310; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+266PoX/DdNbeeOo2WCuE3EdL9HuWPmIk9/UqUBBbx0=; b=PXWL7o97E5wXuCZ7pWMd34cNH0DnBa7kKg7I2AZ2d0hdql94nOlTdYG/F085mfqj3F 3qhJK3NRwp4pr08mHxU/nUI4eOKFcE06TdGnKE5Uf3tEKB/a2+MAwv1rq9zRcgj4uGgU hnRQVNX8Vad8lVpsqnImkOj4dWoD36x2D/YE64TZvphzSSzdoSdmVPhw7MK064+FxOkp wIpc6m95ZS4TW96F+WnoUQb9IUDMHgwvF1uIeYPPKVH6MGHmzwteEG1jjICfscfto7dG 4CeNIdnnk/Ynwi2ZQ9V1aLvLxLxPav+jGl/W1S6Fu/9KOOrhpylSuL23jEOvgGeP+To+ Yn+A== X-Gm-Message-State: AOJu0Yw0K2vek8sfNdD39egZvJwsn5ia13bHcII968LSPphYIXfIF4jL 07mRzudk52kqv3DlBPS7xhceDxyqlKDIgysL2QO9yg== X-Google-Smtp-Source: AGHT+IHhmXg7bVBVNL8pP7gjx5MnOOPbs4T1Xd3VUaAdsTUU9ANbkarm9ppOiL2oIgwCGMznWy4hFA== X-Received: by 2002:a17:90a:4d:b0:27d:8b6f:a626 with SMTP id 13-20020a17090a004d00b0027d8b6fa626mr11821061pjb.13.1700055509590; Wed, 15 Nov 2023 05:38:29 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c1:4617:89ea:c4f4:6815:92c1]) by smtp.gmail.com with ESMTPSA id bk17-20020a17090b081100b00278ff752eacsm6712575pjb.50.2023.11.15.05.38.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 05:38:28 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Matthew Malcomson , Szabolcs Nagy Subject: [PATCH v2] elf: Handle non-directory name in search path (BZ 31035) Date: Wed, 15 Nov 2023 10:38:25 -0300 Message-Id: <20231115133825.3244015-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org The open_path stops if a relative path in search patch contains a component that is a non directory (for instance, if the component is an existing file). For instance: $ cat > lib.c < void foo (void) {} > EOF $ gcc -shared -fPIC -o lib.so lib.c $ cat > main.c < --- elf/Makefile | 12 ++++++ elf/dl-load.c | 9 ++-- elf/tst-non-directory-mod.c | 1 + elf/tst-non-directory-path.c | 7 ++++ elf/tst-non-directory-path.sh | 77 +++++++++++++++++++++++++++++++++++ 5 files changed, 103 insertions(+), 3 deletions(-) create mode 100644 elf/tst-non-directory-mod.c create mode 100644 elf/tst-non-directory-path.c create mode 100755 elf/tst-non-directory-path.sh diff --git a/elf/Makefile b/elf/Makefile index c1e9038a44..85ce0033d2 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -428,6 +428,7 @@ tests += \ tst-nodelete-opened \ tst-nodelete2 \ tst-noload \ + tst-non-directory-path \ tst-null-argv \ tst-p_align1 \ tst-p_align2 \ @@ -856,6 +857,7 @@ modules-names += \ tst-nodelete-dlclose-plugin \ tst-nodelete-opened-lib \ tst-nodelete2mod \ + tst-non-directory-mod \ tst-null-argv-lib \ tst-p_alignmod-base \ tst-p_alignmod3 \ @@ -1122,6 +1124,7 @@ ifeq (yes,$(build-shared)) ifeq ($(run-built-tests),yes) tests-special += \ $(objpfx)argv0test.out \ + $(objpfx)tst-non-directory-path.out \ $(objpfx)tst-pathopt.out \ $(objpfx)tst-rtld-help.out \ $(objpfx)tst-rtld-list-diagnostics.out \ @@ -2987,3 +2990,12 @@ $(objpfx)tst-decorate-maps: $(shared-thread-library) tst-decorate-maps-ENV = \ GLIBC_TUNABLES=glibc.malloc.arena_max=8:glibc.malloc.mmap_threshold=1024:glibc.mem.decorate_maps=1 tst-decorate-maps-ARGS = 8 + +LDFLAGS-tst-non-directory-mod.so = -Wl,-soname,tst-non-directory-mod.so +$(objpfx)tst-non-directory-path: $(objpfx)tst-non-directory-mod.so +$(objpfx)tst-non-directory-path.out: tst-non-directory-path.sh \ + $(objpfx)tst-non-directory-path + $(SHELL) tst-non-directory-path.sh $(objpfx)ld.so $(objpfx)tst-non-directory-path \ + '$(test-wrapper-env)' '$(run_program_env)' \ + '$(rpath-link)' $(objpfx) > $@; \ + $(evaluate-test) diff --git a/elf/dl-load.c b/elf/dl-load.c index 2923b1141d..8d351153c8 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1810,7 +1810,6 @@ open_path (const char *name, size_t namelen, int mode, size_t cnt; char *edp; int here_any = 0; - int err; /* If we are debugging the search for libraries print the path now if it hasn't happened now. */ @@ -1911,8 +1910,12 @@ open_path (const char *name, size_t namelen, int mode, return -1; } } - if (here_any && (err = errno) != ENOENT && err != EACCES) - /* The file exists and is readable, but something went wrong. */ + + /* Continue the search if the file does not exist (ENOENT), if it can + not be accessed (EACCES), or if the a component in the path is not a + directory (for instance, if the component is a existing file meaning + essentially that the pathname is invalid - ENOTDIR). */ + if (here_any && errno != ENOENT && errno != EACCES && errno != ENOTDIR) return -1; /* Remember whether we found anything. */ diff --git a/elf/tst-non-directory-mod.c b/elf/tst-non-directory-mod.c new file mode 100644 index 0000000000..aa6d4c27df --- /dev/null +++ b/elf/tst-non-directory-mod.c @@ -0,0 +1 @@ +void foo (void) {} diff --git a/elf/tst-non-directory-path.c b/elf/tst-non-directory-path.c new file mode 100644 index 0000000000..1016a97a7a --- /dev/null +++ b/elf/tst-non-directory-path.c @@ -0,0 +1,7 @@ +extern void foo (void); + +int main (int argc, char *argv[]) +{ + foo (); + return 0; +} diff --git a/elf/tst-non-directory-path.sh b/elf/tst-non-directory-path.sh new file mode 100755 index 0000000000..e804a4450b --- /dev/null +++ b/elf/tst-non-directory-path.sh @@ -0,0 +1,77 @@ +#!/bin/sh +# Test if library search path does not terminates with non-directory +# components. +# Copyright (C) 2023 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 +# . + +set -e + +rtld=$1 +test_program=$2 +test_wrapper_env=$3 +run_program_env=$4 +# Remove the last space to allow concatenate extra paths. +library_path=$(echo $5) +objpfx=$6 + +test_binary=$(basename ${test_program}) +test_libpath=${test_binary}-x + +mkdir -p ${objpfx}/${test_libpath} +mv ${objpfx}/tst-non-directory-mod.so ${objpfx}/${test_libpath} + +# Check with absolute paths. +${test_wrapper_env} \ +${run_program_env} \ +$rtld --inhibit-cache \ + --library-path \ + "$library_path":"${objpfx}"tst-non-directory-invalid:"${objpfx}"${test_libpath} \ + $test_program 2>&1 && rc=0 || rc=$? + +${test_wrapper_env} \ +${run_program_env} \ +$rtld --inhibit-cache \ + --library-path \ + "$library_path":"${objpfx}"${test_binary}:"${objpfx}"${test_libpath} \ + $test_program 2>&1 && rc=0 || rc=$? + +# Relative paths along with non-existent path in search list. +cd "$objpfx" +${test_wrapper_env} \ +${run_program_env} \ +$rtld --inhibit-cache \ + --library-path \ + "$library_path":../elf/tst-non-directory-invalid::../elf/${test_libpath} \ + $test_program 2>&1 && rc=0 || rc=$? + +# Relative paths along with component in the path is not a directory in search list. +${test_wrapper_env} \ +${run_program_env} \ +$rtld --inhibit-cache \ + --library-path \ + "$library_path":../elf/${test_binary}:../elf/${test_libpath} \ + $test_program 2>&1 && rc=0 || rc=$? + +# Relative paths along with non-existent path and a component in the path that is not a directory. +${test_wrapper_env} \ +${run_program_env} \ +$rtld --inhibit-cache \ + --library-path \ + "$library_path":../elf/tst-non-directory-invalid:../elf/${test_binary}:../elf/${test_libpath} \ + $test_program 2>&1 && rc=0 || rc=$? + +exit $rc