diff options
author | 2019-11-29 17:55:22 +0100 | |
---|---|---|
committer | 2019-12-02 14:55:22 +0100 | |
commit | 4db71d2f9897c6ca7a9d0cadc1fc4067557a4eb3 (patch) | |
tree | 8f3c89f67d8600bc928337dc226f3a107a904dc1 /elf | |
parent | elf/tst-dlopenfail: Disable --no-as-needed for tst-dlopenfailmod1.so (diff) | |
download | glibc-4db71d2f9897c6ca7a9d0cadc1fc4067557a4eb3.tar.gz glibc-4db71d2f9897c6ca7a9d0cadc1fc4067557a4eb3.tar.bz2 glibc-4db71d2f9897c6ca7a9d0cadc1fc4067557a4eb3.zip |
elf: Do not run IFUNC resolvers for LD_DEBUG=unused [BZ #24214]
This commit adds missing skip_ifunc checks to aarch64, arm, i386,
sparc, and x86_64. A new test case ensures that IRELATIVE IFUNC
resolvers do not run in various diagnostic modes of the dynamic
loader.
Reviewed-By: Szabolcs Nagy <szabolcs.nagy@arm.com>
Diffstat (limited to 'elf')
-rw-r--r-- | elf/Makefile | 16 | ||||
-rw-r--r-- | elf/tst-ifunc-fault-bindnow.c | 21 | ||||
-rw-r--r-- | elf/tst-ifunc-fault-lazy.c | 57 |
3 files changed, 94 insertions, 0 deletions
diff --git a/elf/Makefile b/elf/Makefile index f7adebec88..0debea7759 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -348,6 +348,7 @@ tests-ifuncstatic := ifuncmain1static ifuncmain1picstatic \ tests-static += $(tests-ifuncstatic) tests-internal += $(tests-ifuncstatic) ifeq (yes,$(build-shared)) +tests += tst-ifunc-fault-lazy tst-ifunc-fault-bindnow # Note: sysdeps/x86_64/ifuncmain8.c uses ifuncmain8. tests-internal += \ ifuncmain1 ifuncmain1pic ifuncmain1vis ifuncmain1vispic \ @@ -1354,6 +1355,21 @@ $(objpfx)ifuncmain5static: $(addprefix $(objpfx),ifuncdep5.o) $(objpfx)ifuncmain5staticpic: $(addprefix $(objpfx),ifuncdep5pic.o) $(objpfx)ifuncmain5picstatic: $(addprefix $(objpfx),ifuncdep5pic.o) +LDFLAGS-tst-ifunc-fault-lazy = -Wl,-z,lazy +LDFLAGS-tst-ifunc-fault-bindnow = -Wl,-z,now +define tst-ifunc-fault-script +( $(objpfx)ld.so --verify --library-path $(objpfx) $^ \ + && LD_TRACE_LOADED_OBJECTS=1 $(objpfx)ld.so --library-path $(objpfx) $^ \ + && LD_TRACE_LOADED_OBJECTS=1 LD_DEBUG=unused \ + $(objpfx)ld.so --library-path $(objpfx) $^ \ +) > $@; $(evaluate-test) +endef +$(objpfx)tst-ifunc-fault-lazy.out: $(objpfx)tst-ifunc-fault-lazy $(objpfx)ld.so + $(tst-ifunc-fault-script) +$(objpfx)tst-ifunc-fault-bindnow.out: $(objpfx)tst-ifunc-fault-bindnow \ + $(objpfx)ld.so + $(tst-ifunc-fault-script) + $(objpfx)tst-unique1: $(libdl) $(objpfx)tst-unique1.out: $(objpfx)tst-unique1mod1.so \ $(objpfx)tst-unique1mod2.so diff --git a/elf/tst-ifunc-fault-bindnow.c b/elf/tst-ifunc-fault-bindnow.c new file mode 100644 index 0000000000..d767c1f1c1 --- /dev/null +++ b/elf/tst-ifunc-fault-bindnow.c @@ -0,0 +1,21 @@ +/* Program with local IFUNC resolver which crashes. BIND_NOW variant. + Copyright (C) 2019 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/>. */ + +/* The code is the same as the lazy variant. It is just linked + differently. */ +#include "tst-ifunc-fault-lazy.c" diff --git a/elf/tst-ifunc-fault-lazy.c b/elf/tst-ifunc-fault-lazy.c new file mode 100644 index 0000000000..3389de273f --- /dev/null +++ b/elf/tst-ifunc-fault-lazy.c @@ -0,0 +1,57 @@ +/* Program with local IFUNC resolver which crashes, for testing bug 24214. + Copyright (C) 2019 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/>. */ + +/* The construct below is expected to produce an IRELATIVE relocation + with an IFUNC resolver that crashes. ldd should not performs such + relocations. */ + +#include <config.h> + +#ifdef HAVE_GCC_IFUNC + +# include <stddef.h> + +static void +implementation (void) +{ + /* Produce a crash, without depending on any relocations. */ + volatile char *volatile p = NULL; + *p = 0; +} + +static __typeof__ (implementation) * +resolver (void) +{ + /* Produce a crash, without depending on any relocations. */ + volatile char *volatile p = NULL; + *p = 0; + return implementation; +} + +static void magic (void) __attribute__ ((ifunc ("resolver"))); + +void (*magic_ptr) (void) = magic; + +#endif /* HAVE_GCC_IFUNC */ + +/* The program is expected not to run. */ +int +main (void) +{ + return 1; +} |