]> git.ipfire.org Git - thirdparty/glibc.git/commit
Fix ifunc support with DT_TEXTREL segments (BZ#20480)
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>
Mon, 27 Aug 2018 19:16:43 +0000 (16:16 -0300)
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>
Tue, 25 Sep 2018 19:27:50 +0000 (16:27 -0300)
commitb5c45e83753b27dc538dff2d55d4410c385cf3a4
tree7c88e09f3bcf2edbdf2a1196b50c54ab7459b0c5
parentd62f9ec0cce26a275ec68f4564814041a33395b1
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.
ChangeLog
config.make.in
configure
configure.ac
elf/Makefile
elf/dl-reloc.c
elf/tst-ifunc-textrel.c [new file with mode: 0644]