From patchwork Thu Feb 16 02:08:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joan Bruguera X-Patchwork-Id: 65077 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 3D4423858C31 for ; Thu, 16 Feb 2023 02:08:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3D4423858C31 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676513335; bh=IlL9uYCSsEXhChF+N38PubNqV7sSdgznknNMCD1MwkM=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=dH1HvMgznfNApUT7E3vsiI/eotEhv9fkQzJKBdl8NpG0asaXnCUQWsL+016IY0CHI BG71zhNvt7WeOcgbN2wl5/cpveTaMryYLKO/rRodzXvILTgyp9m0Ohb2RN05CesgG5 r3IgRy1znMvqp5ZBkX0BUeS/0X79Ig/4DDtuo12M= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id 66E863858D33 for ; Thu, 16 Feb 2023 02:08:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 66E863858D33 Received: by mail-wm1-x32f.google.com with SMTP id m20-20020a05600c3b1400b003e1e754657aso3070698wms.2 for ; Wed, 15 Feb 2023 18:08:27 -0800 (PST) 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=IlL9uYCSsEXhChF+N38PubNqV7sSdgznknNMCD1MwkM=; b=A6yutqEdJRDpXzj3dEb0jHCCzBPOi6r1c6VCkVRwzjLPyCtoINbW/mvmeMMHjgsGxv fR33Mj/wfPuT35mCplmMl2Gg2zH3xjvbbRnEdCT+cKbNXtaDLJz4CEw5ZuSdk4eZr2QQ H6TvdCgmCl9+tkRDFlzQq3/+yy7Ozo9hrUMhCVyeLexfw3G1Ed2bvg+9xwxRKAgMICPA 74jBpqa6DD6irt9EVedDV2WCd3dnOJSdnNntn7QcAlhY62iCugdK7a/2hsiSSJKpg4Vr q8JnmUVWLAxiwZcWeX/hDwJmnK9yjoG6S0TYN8zOJbJHwx1TB6Q+lWLMCo/vGMmxTKLT 7lhQ== X-Gm-Message-State: AO0yUKW7aWPB+zoSxM65uiLDgkwNq3MmAbeMFL9uPPjSqM1Mn29kJHYU qTEYo9OnKZHhBnRUju9R/ILRcHI1Eoo= X-Google-Smtp-Source: AK7set868cZtG3ozF3sFPf8XAOUnKzd7vBKOyWeWcwXWxz5uyC77tUmYE61b3upbTY0wXd+vHfDvtA== X-Received: by 2002:a05:600c:1695:b0:3da:50b0:e96a with SMTP id k21-20020a05600c169500b003da50b0e96amr3183291wmn.29.1676513305704; Wed, 15 Feb 2023 18:08:25 -0800 (PST) Received: from solpc.. (67.pool90-171-92.dynamic.orange.es. [90.171.92.67]) by smtp.gmail.com with ESMTPSA id i1-20020a05600c290100b003dc492e4430sm122273wmd.28.2023.02.15.18.08.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 18:08:25 -0800 (PST) To: libc-alpha@sourceware.org Cc: adhemerval.zanella@linaro.org, Joan Bruguera Subject: [PATCH v3] elf: Restore ldconfig libc6 implicit soname logic [BZ #30125] Date: Thu, 16 Feb 2023 02:08:10 +0000 Message-Id: <20230216020810.3947682-1-joanbrugueram@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230216012442.3903141-1-joanbrugueram@gmail.com> References: <20230216012442.3903141-1-joanbrugueram@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.6 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 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: Joan Bruguera via Libc-alpha From: Joan Bruguera Reply-To: Joan Bruguera Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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 | 7 +++++ elf/ldconfig.c | 4 +-- elf/readlib.c | 19 -------------- elf/tst-ldconfig-no-soname.sh | 48 +++++++++++++++++++++++++++++++++++ sysdeps/generic/ldconfig.h | 2 -- 5 files changed, 57 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..a61a8fedba --- /dev/null +++ b/elf/tst-ldconfig-no-soname.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# Test that ldconfig 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 + +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,