From ead3cea7d8948113fe205243acbddbda609de5c9 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sat, 3 Sep 2016 20:25:59 +0200 Subject: Set NODELETE flag after checking for NULL pointer The commit b632bdd3 moved the setting of the DF_1_NODELETE flag earlier in the dl_open_worker function. However when calling dlopen with both RTLD_NODELETE and RTLD_NOLOAD, the pointer returned by _dl_map_object is NULL. This condition is checked just after setting the flag, while it should be done before. Fix that. Changelog: [BZ #19810] * elf/dl-open.c (dl_open_worker): Set DF_1_NODELETE flag later. * elf/tst-noload.c: New test case. * elf/Makefile (tests): Add tst-noload. --- ChangeLog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 07cc502..78bb16b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-09-03 Aurelien Jarno + + [BZ #19810] + * elf/dl-open.c (dl_open_worker): Set DF_1_NODELETE flag later. + * elf/tst-noload.c: New test case. + * elf/Makefile (tests): Add tst-noload. + 2016-09-02 Roland McGrath * sysdeps/nacl/dup.c: Add libc_hidden_def. -- cgit v1.1