git.ipfire.org Git - thirdparty/glibc.git/commit

Call _dl_open_check after relocation [BZ #24259]

This is a workaround for [BZ #20839] which doesn't remove the NODELETE
object when _dl_open_check throws an exception. Move it after relocation
in dl_open_worker to avoid leaving the NODELETE object mapped without
relocation.

[BZ #24259]
* elf/dl-open.c (dl_open_worker): Call _dl_open_check after
relocation.
* sysdeps/x86/Makefile (tests): Add tst-cet-legacy-5a,
tst-cet-legacy-5b, tst-cet-legacy-6a and tst-cet-legacy-6b.
(modules-names): Add tst-cet-legacy-mod-5a, tst-cet-legacy-mod-5b,
tst-cet-legacy-mod-5c, tst-cet-legacy-mod-6a, tst-cet-legacy-mod-6b
and tst-cet-legacy-mod-6c.
(CFLAGS-tst-cet-legacy-5a.c): New.
(CFLAGS-tst-cet-legacy-5b.c): Likewise.
(CFLAGS-tst-cet-legacy-mod-5a.c): Likewise.
(CFLAGS-tst-cet-legacy-mod-5b.c): Likewise.
(CFLAGS-tst-cet-legacy-mod-5c.c): Likewise.
(CFLAGS-tst-cet-legacy-6a.c): Likewise.
(CFLAGS-tst-cet-legacy-6b.c): Likewise.
(CFLAGS-tst-cet-legacy-mod-6a.c): Likewise.
(CFLAGS-tst-cet-legacy-mod-6b.c): Likewise.
(CFLAGS-tst-cet-legacy-mod-6c.c): Likewise.
($(objpfx)tst-cet-legacy-5a): Likewise.
($(objpfx)tst-cet-legacy-5a.out): Likewise.
($(objpfx)tst-cet-legacy-mod-5a.so): Likewise.
($(objpfx)tst-cet-legacy-mod-5b.so): Likewise.
($(objpfx)tst-cet-legacy-5b): Likewise.
($(objpfx)tst-cet-legacy-5b.out): Likewise.
(tst-cet-legacy-5b-ENV): Likewise.
($(objpfx)tst-cet-legacy-6a): Likewise.
($(objpfx)tst-cet-legacy-6a.out): Likewise.
($(objpfx)tst-cet-legacy-mod-6a.so): Likewise.
($(objpfx)tst-cet-legacy-mod-6b.so): Likewise.
($(objpfx)tst-cet-legacy-6b): Likewise.
($(objpfx)tst-cet-legacy-6b.out): Likewise.
(tst-cet-legacy-6b-ENV): Likewise.
* sysdeps/x86/tst-cet-legacy-5.c: New file.
* sysdeps/x86/tst-cet-legacy-5a.c: Likewise.
* sysdeps/x86/tst-cet-legacy-5b.c: Likewise.
* sysdeps/x86/tst-cet-legacy-6.c: Likewise.
* sysdeps/x86/tst-cet-legacy-6a.c: Likewise.
* sysdeps/x86/tst-cet-legacy-6b.c: Likewise.
* sysdeps/x86/tst-cet-legacy-mod-5.c: Likewise.
* sysdeps/x86/tst-cet-legacy-mod-5a.c: Likewise.
* sysdeps/x86/tst-cet-legacy-mod-5b.c: Likewise.
* sysdeps/x86/tst-cet-legacy-mod-5c.c: Likewise.
* sysdeps/x86/tst-cet-legacy-mod-6.c: Likewise.
* sysdeps/x86/tst-cet-legacy-mod-6a.c: Likewise.
* sysdeps/x86/tst-cet-legacy-mod-6b.c: Likewise.
* sysdeps/x86/tst-cet-legacy-mod-6c.c: Likewise.

(cherry picked from commit d0093c5cefb7f7a4143f3bb03743633823229cc6)

author	H.J. Lu <hjl.tools@gmail.com>
	Mon, 1 Jul 2019 19:23:10 +0000 (12:23 -0700)
committer	DJ Delorie <dj@redhat.com>
	Thu, 31 Oct 2019 20:53:14 +0000 (16:53 -0400)
commit	0d3905b110000463775b3fb189213833acaebf81
tree	52f1297d3cf821632f363222bd3e3bc4f8d23009	tree \| snapshot
parent	f144981490bd2ab13189d85902ca74beecb307e4	commit \| diff

ChangeLog		diff \| blob \| blame \| history
elf/dl-open.c		diff \| blob \| blame \| history
sysdeps/x86/Makefile		diff \| blob \| blame \| history
sysdeps/x86/tst-cet-legacy-5.c	[new file with mode: 0644]	blob
sysdeps/x86/tst-cet-legacy-5a.c	[new file with mode: 0644]	blob
sysdeps/x86/tst-cet-legacy-5b.c	[new file with mode: 0644]	blob
sysdeps/x86/tst-cet-legacy-6.c	[new file with mode: 0644]	blob
sysdeps/x86/tst-cet-legacy-6a.c	[new file with mode: 0644]	blob
sysdeps/x86/tst-cet-legacy-6b.c	[new file with mode: 0644]	blob
sysdeps/x86/tst-cet-legacy-mod-5.c	[new file with mode: 0644]	blob
sysdeps/x86/tst-cet-legacy-mod-5a.c	[new file with mode: 0644]	blob
sysdeps/x86/tst-cet-legacy-mod-5b.c	[new file with mode: 0644]	blob
sysdeps/x86/tst-cet-legacy-mod-5c.c	[new file with mode: 0644]	blob
sysdeps/x86/tst-cet-legacy-mod-6.c	[new file with mode: 0644]	blob
sysdeps/x86/tst-cet-legacy-mod-6a.c	[new file with mode: 0644]	blob
sysdeps/x86/tst-cet-legacy-mod-6b.c	[new file with mode: 0644]	blob
sysdeps/x86/tst-cet-legacy-mod-6c.c	[new file with mode: 0644]	blob
sysdeps/x86/tst-cet-legacy-mod-6d.c	[new file with mode: 0644]	blob