From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by sourceware.org (Postfix) with ESMTPS id CD1773858D33 for ; Thu, 16 Feb 2023 01:24:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CD1773858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-x432.google.com with SMTP id h16so387628wrz.12 for ; Wed, 15 Feb 2023 17:24:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jm2CrgeOUQGFbzWxCdiSrIjk9sfmDHPJoX5JFbA7MOE=; b=FI9f9lpPigsAwNLnNa+hHs1JXHJ96gjmk0+i5qA78R8RW6m7qvfNPUcH98KMKDHuXx q40uzbkIaDppaDBExQgiAWnvVPgKX8tg2eN9JQr6mkRXBSIza67D/T4ti2A1JFMSV+/v FzbTedJOiHPQ26hFlEKpgwXnMmZ3B7pW5fs+ydoseP+HWmcQLjZn6p3PBRapAoZsBVUY yuuyvcdNO84PIxHZrSGWym0HQtMZ0vtooWy1KUiUVJU/xCthKyQOE5z3v4cIas1fmopp p58G+/dXUKx+gu1Vsh8dgL3uqryjoqLpmXdQAW+cactBr45vmw0UjoXrk2k0xNBMoVlO W0Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jm2CrgeOUQGFbzWxCdiSrIjk9sfmDHPJoX5JFbA7MOE=; b=4+wHuWxioRLmbfGhij3wbI4Uw5S5dcjfJH87BKP+5eIBFWbInAZJ30ZGas8nxsoGXk qNBufvf+VD/+AF2puyr5fBpAq3j9gA//nk4hi7L8gRw/wML5ycaAgGSu7rd6tnoa1fvG IgAL3gW0cVShAzr9ui1e6bdYRd+trbJbTr9NAuhJdxJpHWTO8vqAw0gIIGkJzCuVhyEe ysn6jxBVUk6wwaIjBwmCOxEzGYwt6D3b2VBYa0rL+m9KCGGiGfd6YthVUA9gYVShs2Wk R8jotwR5y/4U7Im7vE/YBhyhfUcOeNNK2fN4uts3S7d1vUvD+QU0ppazueFnCvaTFvpa ybkA== X-Gm-Message-State: AO0yUKXEKlobhbZcpSDKgnwAlRhn9IQXEA8yorPoPmlsUvLtB3uTpAxH qQrBCoBXGV7hj7Ah/jnjeJ/C6Hb3/II= X-Google-Smtp-Source: AK7set8VNA3g+zTpr7KPYnbWV24BdjkbYQGa4bMGd25tlbSx39WuKlL8D/561+VTW1FwtgOQurqRZQ== X-Received: by 2002:a5d:474c:0:b0:2c5:7b54:89b4 with SMTP id o12-20020a5d474c000000b002c57b5489b4mr599634wrs.56.1676510692412; Wed, 15 Feb 2023 17:24:52 -0800 (PST) Received: from solpc.. (67.pool90-171-92.dynamic.orange.es. [90.171.92.67]) by smtp.gmail.com with ESMTPSA id r12-20020adff10c000000b002c54c92e125sm131903wro.46.2023.02.15.17.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 17:24:52 -0800 (PST) From: Joan Bruguera To: libc-alpha@sourceware.org Cc: adhemerval.zanella@linaro.org, Joan Bruguera Subject: [PATCH v2] elf: Restore ldconfig libc6 implicit soname logic [BZ #30125] Date: Thu, 16 Feb 2023 01:24:42 +0000 Message-Id: <20230216012442.3903141-1-joanbrugueram@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230215014124.4144451-1-joanbrugueram@gmail.com> References: <20230215014124.4144451-1-joanbrugueram@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.9 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: While cleaning up old libc version support, the deprecated libc4 code was accidentally kept in `implicit_soname`, instead of the libc6 code. This causes additional symlinks to be created by `ldconfig` for libraries without a soname, e.g. a library `libsomething.123.456.789` without a soname will create a `libsomething.123` -> `libsomething.123.456.789` symlink. As the libc6 version of the `implicit_soname` code is a trivial `xstrdup`, just inline it and remove `implicit_soname` altogether. Some further simplification looks possible (e.g. the call to `create_links` looks like a no-op if `soname == NULL`, other than the verbose printfs), but logic is kept as-is for now. Fixes: BZ #30125 Fixes: 8ee878592c4a ("Assume only FLAG_ELF_LIBC6 suport") --- elf/Makefile | 7 ++++++ elf/ldconfig.c | 4 +-- elf/readlib.c | 19 -------------- elf/tst-ldconfig-no-soname.sh | 47 +++++++++++++++++++++++++++++++++++ sysdeps/generic/ldconfig.h | 2 -- 5 files changed, 56 insertions(+), 23 deletions(-) create mode 100644 elf/tst-ldconfig-no-soname.sh diff --git a/elf/Makefile b/elf/Makefile index 2fc6391183..476f062dae 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -627,6 +627,7 @@ tests-special += \ $(objpfx)noload-mem.out \ $(objpfx)tst-ldconfig-X.out \ $(objpfx)tst-ldconfig-p.out \ + $(objpfx)tst-ldconfig-no-soname.out \ $(objpfx)tst-leaks1-mem.out \ $(objpfx)tst-rtld-help.out \ # tests-special @@ -2402,6 +2403,12 @@ $(objpfx)tst-ldconfig-p.out : tst-ldconfig-p.sh $(objpfx)ldconfig '$(run-program-env)' > $@; \ $(evaluate-test) +$(objpfx)tst-ldconfig-no-soname.out : tst-ldconfig-no-soname.sh \ + $(objpfx)ldconfig + $(SHELL) $< '$(CC)' '$(common-objpfx)' '$(test-wrapper-env)' \ + '$(run-program-env)' > $@; \ + $(evaluate-test) + # Test static linking of all the libraries we can possibly link # together. Note that in some configurations this may be less than the # complete list of libraries we build but we try to maxmimize this list. diff --git a/elf/ldconfig.c b/elf/ldconfig.c index 3f1b30c570..2fc45ad825 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c @@ -616,7 +616,7 @@ manual_link (char *library) goto out; } if (soname == NULL) - soname = implicit_soname (libname, flag); + soname = xstrdup (libname); create_links (real_path, path, libname, soname); free (soname); out: @@ -849,7 +849,7 @@ search_dir (const struct dir_entry *entry) } if (soname == NULL) - soname = implicit_soname (direntry->d_name, flag); + soname = xstrdup (direntry->d_name); /* A link may just point to itself. */ if (is_link) diff --git a/elf/readlib.c b/elf/readlib.c index c5c3591eef..bc13d9acc6 100644 --- a/elf/readlib.c +++ b/elf/readlib.c @@ -166,24 +166,5 @@ process_file (const char *real_file_name, const char *file_name, return ret; } -/* Returns made up soname if lib doesn't have explicit DT_SONAME. */ - -char * -implicit_soname (const char *lib, int flag) -{ - char *soname = xstrdup (lib); - - /* Aout files don't have a soname, just return the name - including the major number. */ - char *major = strstr (soname, ".so."); - if (major) - { - char *dot = strstr (major + 4, "."); - if (dot) - *dot = '\0'; - } - return soname; -} - /* Get architecture specific version of process_elf_file. */ #include diff --git a/elf/tst-ldconfig-no-soname.sh b/elf/tst-ldconfig-no-soname.sh new file mode 100644 index 0000000000..9f0f0cda50 --- /dev/null +++ b/elf/tst-ldconfig-no-soname.sh @@ -0,0 +1,47 @@ +#!/bin/sh +# Test that ldconfig does not create symlinks for libraries without a soname. +# 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 -ex + +CC=$1 +common_objpfx=$2 +test_wrapper_env=$3 +run_program_env=$4 + +testroot="${common_objpfx}elf/bug30125-test-directory" +cleanup () { + rm -rf "$testroot" +} +trap cleanup 0 + +rm -rf "$testroot" +mkdir -p $testroot/lib $testroot/etc + +$CC /dev/null -o $testroot/lib/libsomething.so.1.2.3 -shared + +${test_wrapper_env} \ +${run_program_env} \ +${common_objpfx}elf/ldconfig -f /dev/null \ + -C $testroot/etc/ld.so.cache \ + $testroot/lib + +if [ -n "$(find $testroot/lib -type l)" ]; then + echo "error: $0 - symlink found" + exit 1 +fi diff --git a/sysdeps/generic/ldconfig.h b/sysdeps/generic/ldconfig.h index 0e1a9a9515..e9e9e19d0f 100644 --- a/sysdeps/generic/ldconfig.h +++ b/sysdeps/generic/ldconfig.h @@ -90,8 +90,6 @@ extern int process_file (const char *real_file_name, const char *file_name, const char *lib, int *flag, unsigned int *isa_level, char **soname, int is_link, struct stat *stat_buf); -extern char *implicit_soname (const char *lib, int flag); - /* Declared in readelflib.c. */ extern int process_elf_file (const char *file_name, const char *lib, int *flag, unsigned int *isa_level, char **soname, -- 2.39.2