diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2018-08-27 16:16:43 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2018-09-25 16:27:50 -0300 |
| commit | b5c45e83753b27dc538dff2d55d4410c385cf3a4 (patch) | |
| tree | 7c88e09f3bcf2edbdf2a1196b50c54ab7459b0c5 /elf/Makefile | |
| parent | d62f9ec0cce26a275ec68f4564814041a33395b1 (diff) | |
| download | glibc-b5c45e83753b27dc538dff2d55d4410c385cf3a4.zip glibc-b5c45e83753b27dc538dff2d55d4410c385cf3a4.tar.gz glibc-b5c45e83753b27dc538dff2d55d4410c385cf3a4.tar.bz2 | |
Fix ifunc support with DT_TEXTREL segments (BZ#20480)
Currently, DT_TEXTREL is incompatible with IFUNC. When DT_TEXTREL or
DF_TEXTREL is seen, the dynamic linker calls __mprotect on the segments
with PROT_READ|PROT_WRITE before applying dynamic relocations. It leads
to segfault when performing IFUNC resolution (which requires PROT_EXEC
as well for the IFUNC resolver).
This patch makes it call __mprotect with extra PROT_WRITE bit, which
will keep the PROT_EXEC bit if exists, and thus fixes the segfault.
FreeBSD rtld libexec/rtld-elf/rtld.c (reloc_textrel_prot) does the same.
Checked on x86_64-linux-gnu, i686-linux-gnu, aarch64-linux-gnu,
sparc64-linux-gnu, sparcv9-linux-gnu, and armv8-linux-gnueabihf.
Adam J. Richte <adam_richter2004@yahoo.com>
Adhemerval Zanella <adhemerval.zanella@linaro.org>
Fangrui Song <maskray@google.com>
[BZ #20480]
* config.h.in (CAN_TEXTREL_IFUNC): New define.
* configure.ac: Add check if linker supports textrel relocation with
ifunc.
* elf/dl-reloc.c (_dl_relocate_object): Use all required flags on
DT_TEXTREL segments, not only PROT_READ and PROT_WRITE.
* elf/Makefile (ifunc-pie-tests): Add tst-ifunc-textrel.
(CFLAGS-tst-ifunc-textrel.c): New rule.
* elf/tst-ifunc-textrel.c: New file.
Diffstat (limited to 'elf/Makefile')
| -rw-r--r-- | elf/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/elf/Makefile b/elf/Makefile index 4a4ca84..037f681 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -340,6 +340,9 @@ test-internal-extras += $(ifunc-test-modules) ifeq (yes,$(have-fpie)) ifunc-pie-tests = ifuncmain1pie ifuncmain1vispie ifuncmain1staticpie \ ifuncmain5pie ifuncmain6pie ifuncmain7pie +ifeq (yes,$(have-textrel_ifunc)) +ifunc-pie-tests += tst-ifunc-textrel +endif tests-internal += $(ifunc-pie-tests) tests-pie += $(ifunc-pie-tests) endif @@ -1269,6 +1272,7 @@ CFLAGS-ifuncmain1staticpie.c += $(pie-ccflag) CFLAGS-ifuncmain5pie.c += $(pie-ccflag) CFLAGS-ifuncmain6pie.c += $(pie-ccflag) CFLAGS-ifuncmain7pie.c += $(pie-ccflag) +CFLAGS-tst-ifunc-textrel.c += $(pic-ccflag) $(objpfx)ifuncmain1pie: $(objpfx)ifuncmod1.so $(objpfx)ifuncmain1staticpie: $(objpfx)ifuncdep1pic.o |