From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by sourceware.org (Postfix) with ESMTPS id 779C93858D32 for ; Sat, 18 Feb 2023 21:52:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 779C93858D32 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-wm1-x331.google.com with SMTP id i22so1147413wmq.0 for ; Sat, 18 Feb 2023 13:52:39 -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=Jrc4HgxsmfjE4kCT6iF+TyT0rbGIZZ6GEFXE5CQiGLo=; b=cvkzKiegO66TUzCVTvLbbAKNxs50eJefEx/huPFQiofhuwU9W8pt9gzvGXh1CTqAlN wdZWz+d/E8e71WqEGjLxjQMzMbfi2GA5TZNqem9J9jA4gMRjyHjou0o9Ppl4QFyyxWPR SHY2n5b2jHhHR9LHwZ32SA9rz9T53ZiyeuKURr43edBPqod7mfI451BaIOCEaGlk2MYM ZuZ6SB6yJfcbtceTPE1JxhydhZwAcShiGlPoc7edVk5wVeB7qXHbrjXZM68Gyx0TcFIZ 6Ta13wZCnnkDmdpFeBjS0W5X2yeM7HX0bcaV6aznVCkRIu84uWj6icVYzsmgitAnk8zU fIyA== 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=Jrc4HgxsmfjE4kCT6iF+TyT0rbGIZZ6GEFXE5CQiGLo=; b=Tb3tn5omPsH5OcFn9NMz3mocpeUCCduTpm03OxxcrVqsCNyseSlwGzec/KkMpMT/vt ECaK51uShd4iLqK36FbT7MjY4Ng3/OO3kbOi7yjGP72eaIt29e1YBvy0pyEPi0Tes5KF z5Ds5B+k8MqirBdXL1hA7XQ9TC2IDxIMOZyV4i8TfQzt3x+VndjdN8wlOdrlcHsNF7KR PUMkG797kuLU85B4+e4So8Q7q1YFejJtd2+cNGZFQ43k+nLfT+VmnazGfGV6lXNLkHl9 IOxQw9U/6GhZf9fZWGStlx8c/6C55aBTshB+ZYAPJ5bz80OizDPosvoSOGNrm+5HWSxW hHkQ== X-Gm-Message-State: AO0yUKVCHA+7MH+vkI/T02m8lvQj8v/fVkSw3n4fHOOAMuyRdO2i/bb9 pBMpTBGgF7++bYMqGEVIJgg3/zXh1vU= X-Google-Smtp-Source: AK7set8eAWPw4xsV3/c7qlNfIgsLhmAgHjG2BpjPTGli6dMALm7cnFF4Ojjfng0jGy0FBTRTSBJ6dw== X-Received: by 2002:a05:600c:4e41:b0:3e1:feb9:5a2f with SMTP id e1-20020a05600c4e4100b003e1feb95a2fmr8302486wmq.2.1676757157977; Sat, 18 Feb 2023 13:52:37 -0800 (PST) Received: from solpc.. (67.pool90-171-92.dynamic.orange.es. [90.171.92.67]) by smtp.gmail.com with ESMTPSA id k22-20020a05600c0b5600b003e21ba8684dsm7670474wmr.26.2023.02.18.13.52.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Feb 2023 13:52:37 -0800 (PST) From: Joan Bruguera To: libc-alpha@sourceware.org Cc: adhemerval.zanella@linaro.org, Joan Bruguera Subject: [PATCH v4] elf: Restore ldconfig libc6 implicit soname logic [BZ #30125] Date: Sat, 18 Feb 2023 21:52:15 +0000 Message-Id: <20230218215215.3930119-1-joanbrugueram@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230216020810.3947682-1-joanbrugueram@gmail.com> References: <20230216020810.3947682-1-joanbrugueram@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.7 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") Signed-off-by: Joan Bruguera --- elf/Makefile | 14 ++++++ elf/ldconfig.c | 4 +- elf/readlib.c | 19 -------- elf/tst-ldconfig-soname-lib-with-soname.c | 1 + elf/tst-ldconfig-soname-lib-without-soname.c | 1 + elf/tst-ldconfig-soname.sh | 49 ++++++++++++++++++++ sysdeps/generic/ldconfig.h | 2 - 7 files changed, 67 insertions(+), 23 deletions(-) create mode 100644 elf/tst-ldconfig-soname-lib-with-soname.c create mode 100644 elf/tst-ldconfig-soname-lib-without-soname.c create mode 100644 elf/tst-ldconfig-soname.sh diff --git a/elf/Makefile b/elf/Makefile index 2fc6391183..0d19964d42 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-soname.out \ $(objpfx)tst-leaks1-mem.out \ $(objpfx)tst-rtld-help.out \ # tests-special @@ -859,6 +860,8 @@ modules-names += \ tst-initorderb2 \ tst-latepthreadmod \ tst-ldconfig-ld-mod \ + tst-ldconfig-soname-lib-with-soname \ + tst-ldconfig-soname-lib-without-soname \ tst-main1mod \ tst-nodelete2mod \ tst-nodelete-dlclose-dso \ @@ -2402,6 +2405,17 @@ $(objpfx)tst-ldconfig-p.out : tst-ldconfig-p.sh $(objpfx)ldconfig '$(run-program-env)' > $@; \ $(evaluate-test) +LDFLAGS-tst-ldconfig-soname-lib-with-soname.so = \ + -Wl,-soname,libtst-ldconfig-soname-lib-with-soname.so.1 + +$(objpfx)tst-ldconfig-soname.out : tst-ldconfig-soname.sh \ + $(objpfx)ldconfig \ + $(objpfx)tst-ldconfig-soname-lib-with-soname.so \ + $(objpfx)tst-ldconfig-soname-lib-without-soname.so + $(SHELL) $< '$(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-soname-lib-with-soname.c b/elf/tst-ldconfig-soname-lib-with-soname.c new file mode 100644 index 0000000000..d1ab56ad58 --- /dev/null +++ b/elf/tst-ldconfig-soname-lib-with-soname.c @@ -0,0 +1 @@ +/* This file intentionally left blank */ diff --git a/elf/tst-ldconfig-soname-lib-without-soname.c b/elf/tst-ldconfig-soname-lib-without-soname.c new file mode 100644 index 0000000000..d1ab56ad58 --- /dev/null +++ b/elf/tst-ldconfig-soname-lib-without-soname.c @@ -0,0 +1 @@ +/* This file intentionally left blank */ diff --git a/elf/tst-ldconfig-soname.sh b/elf/tst-ldconfig-soname.sh new file mode 100644 index 0000000000..406f526dbf --- /dev/null +++ b/elf/tst-ldconfig-soname.sh @@ -0,0 +1,49 @@ +#!/bin/sh +# Test that ldconfig creates symlinks according to the library's soname +# (and in particular, does not create symlinks for libraries without a soname) +# Copyright (C) 2000-2023 Free Software Foundation, Inc. +# Copyright The GNU Toolchain Authors. +# 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 + +common_objpfx=$1 +test_wrapper_env=$2 +run_program_env=$3 + +testroot="${common_objpfx}elf/bug30125-test-directory" +cleanup () { + rm -rf "$testroot" +} +trap cleanup 0 + +rm -rf "$testroot" +mkdir -p $testroot/lib +cp "${common_objpfx}elf/tst-ldconfig-soname-lib-with-soname.so" \ + $testroot/lib/libtst-ldconfig-soname-lib-with-soname.so.1.2.3 +cp "${common_objpfx}elf/tst-ldconfig-soname-lib-without-soname.so" \ + $testroot/lib/libtst-ldconfig-soname-lib-without-soname.so.1.2.3 + +${test_wrapper_env} \ +${run_program_env} \ +${common_objpfx}elf/ldconfig -vn $testroot/lib + +LINKS=$(cd $testroot/lib && find . -type l) +if [ "$LINKS" != "./libtst-ldconfig-soname-lib-with-soname.so.1" ]; then + echo "error: $0 - extra symlinks 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