public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] elf: Fix audit regression Date: Fri, 30 Jul 2021 19:15:53 +0000 (GMT) [thread overview] Message-ID: <20210730191553.467143972022@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3908fa933a4354309225af616d9242f595e11ccf commit 3908fa933a4354309225af616d9242f595e11ccf Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> Date: Wed Jun 30 00:21:18 2021 -0300 elf: Fix audit regression Commit 03e187a41d9 added a regression when an audit module does not have libc as DT_NEEDED (although unusual it is possible). Checked on x86_64-linux-gnu. Diff: --- elf/Makefile | 12 +++++++++++- elf/dl-open.c | 11 ++--------- elf/tst-audit17.c | 25 +++++++++++++++++++++++++ elf/tst-auditmod17.c | 23 +++++++++++++++++++++++ 4 files changed, 61 insertions(+), 10 deletions(-) diff --git a/elf/Makefile b/elf/Makefile index 87a70d6c7a..d05f410592 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -219,7 +219,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ tst-dlopen-self tst-auditmany tst-initfinilazyfail tst-dlopenfail \ tst-dlopenfail-2 \ tst-filterobj tst-filterobj-dlopen tst-auxobj tst-auxobj-dlopen \ - tst-audit14 tst-audit15 tst-audit16 \ + tst-audit14 tst-audit15 tst-audit16 tst-audit17 \ tst-single_threaded tst-single_threaded-pthread \ tst-tls-ie tst-tls-ie-dlmopen argv0test \ tst-glibc-hwcaps tst-glibc-hwcaps-prepend tst-glibc-hwcaps-mask \ @@ -1475,6 +1475,16 @@ $(objpfx)tst-auditlogmod-3.so: $(libsupport) $(objpfx)tst-audit16.out: \ $(objpfx)tst-auditlogmod-1.so $(objpfx)tst-auditlogmod-2.so \ $(objpfx)tst-auditlogmod-3.so +$(objpfx)tst-audit17.out: $(objpfx)tst-auditmod17.so +# The test check if a audit library without libc.so on DT_NEEDED works as +# intended, so it uses an explicit link rule. +$(objpfx)tst-auditmod17.so: $(objpfx)tst-auditmod17.os + $(CC) -nostdlib -nostartfiles -shared -o $@.new \ + $(filter-out $(map-file),$^) + $(call after-link,$@.new) + mv -f $@.new $@ +CFLAGS-.os += $(call elide-stack-protector,.os,tst-auditmod17) +tst-audit17-ENV = LD_AUDIT=$(objpfx)tst-auditmod17.so # tst-sonamemove links against an older implementation of the library. LDFLAGS-tst-sonamemove-linkmod1.so = \ diff --git a/elf/dl-open.c b/elf/dl-open.c index d2240d8747..ec386626f9 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -769,16 +769,9 @@ dl_open_worker (void *a) namespace. */ if (!args->libc_already_loaded) { + /* dlopen cannot be used to load an initial libc by design. */ struct link_map *libc_map = GL(dl_ns)[args->nsid].libc_map; -#ifdef SHARED - bool initial = libc_map->l_ns == LM_ID_BASE; -#else - /* In the static case, there is only one namespace, but it - contains a secondary libc (the primary libc is statically - linked). */ - bool initial = false; -#endif - _dl_call_libc_early_init (libc_map, initial); + _dl_call_libc_early_init (libc_map, false); } /* Run the initializer functions of new objects. Temporarily diff --git a/elf/tst-audit17.c b/elf/tst-audit17.c new file mode 100644 index 0000000000..92986699d4 --- /dev/null +++ b/elf/tst-audit17.c @@ -0,0 +1,25 @@ +/* Check DT_AUDIT with audit not linked against libc. + Copyright (C) 2021 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 + <https://www.gnu.org/licenses/>. */ + +static int +do_test (void) +{ + return 0; +} + +#include <support/test-driver.c> diff --git a/elf/tst-auditmod17.c b/elf/tst-auditmod17.c new file mode 100644 index 0000000000..7a4467f597 --- /dev/null +++ b/elf/tst-auditmod17.c @@ -0,0 +1,23 @@ +/* Check DT_AUDIT with audit not linked against libc. + Copyright (C) 2021 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 + <https://www.gnu.org/licenses/>. */ + +unsigned int +la_version (unsigned int version) +{ + return version; +}
reply other threads:[~2021-07-30 19:15 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20210730191553.467143972022@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@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: linkBe 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).