From: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
To: Joan Bruguera <joanbrugueram@gmail.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH v4] elf: Restore ldconfig libc6 implicit soname logic [BZ #30125]
Date: Mon, 20 Feb 2023 09:32:21 -0300 [thread overview]
Message-ID: <a24963fd-b9aa-400d-d092-dde2b5626c04@linaro.org> (raw)
In-Reply-To: <20230218215215.3930119-1-joanbrugueram@gmail.com>
On 18/02/23 18:52, Joan Bruguera wrote:
> 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 <joanbrugueram@gmail.com>
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> 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.
Ok.
> 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)
Ok.
> 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 <readelflib.c>
Ok.
> 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
> +# <https://www.gnu.org/licenses/>.
> +
> +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
Ok.
> 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,
Ok.
next prev parent reply other threads:[~2023-02-20 12:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-15 1:41 [PATCH] elf: Restore lconfig " Joan Bruguera
2023-02-15 1:47 ` Joan Bruguera
2023-02-15 13:19 ` Adhemerval Zanella Netto
2023-02-16 1:29 ` Joan Bruguera
2023-02-16 1:40 ` Sam James
2023-02-16 2:23 ` [PATCH v3] elf: Restore ldconfig " Joan Bruguera
2023-02-16 6:08 ` Florian Weimer
2023-02-16 2:23 ` [PATCH] elf: Restore lconfig " Joan Bruguera
2023-02-16 6:01 ` Florian Weimer
2023-02-16 1:24 ` [PATCH v2] elf: Restore ldconfig " Joan Bruguera
2023-02-16 2:08 ` [PATCH v3] " Joan Bruguera
2023-02-18 21:52 ` [PATCH v4] " Joan Bruguera
2023-02-20 12:32 ` Adhemerval Zanella Netto [this message]
2023-02-20 13:21 ` Florian Weimer
2023-02-20 13:55 ` Adhemerval Zanella Netto
2023-02-20 14:04 ` Florian Weimer
2023-02-20 14:26 ` Adhemerval Zanella Netto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a24963fd-b9aa-400d-d092-dde2b5626c04@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=joanbrugueram@gmail.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).