diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2016-09-03 20:25:59 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2016-09-03 20:25:59 +0200 |
| commit | ead3cea7d8948113fe205243acbddbda609de5c9 (patch) | |
| tree | df2c4e8064d2d96ebad64d014dd067845e89f2a7 /elf/Makefile | |
| parent | 6b75ba1388bff6a81bad410d7318d385a043b3cb (diff) | |
| download | glibc-ead3cea7d8948113fe205243acbddbda609de5c9.zip glibc-ead3cea7d8948113fe205243acbddbda609de5c9.tar.gz glibc-ead3cea7d8948113fe205243acbddbda609de5c9.tar.bz2 | |
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.
Diffstat (limited to 'elf/Makefile')
| -rw-r--r-- | elf/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/elf/Makefile b/elf/Makefile index 593403c..97f0ec2 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -149,7 +149,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ tst-nodelete) \ tst-initorder tst-initorder2 tst-relsort1 tst-null-argv \ tst-ptrguard1 tst-tlsalign tst-tlsalign-extern tst-nodelete-opened \ - tst-nodelete2 tst-audit11 tst-audit12 tst-dlsym-error + tst-nodelete2 tst-audit11 tst-audit12 tst-dlsym-error tst-noload # reldep9 ifeq ($(build-hardcoded-path-in-tests),yes) tests += tst-dlopen-aout @@ -554,6 +554,7 @@ $(objpfx)tst-null-argv: $(objpfx)tst-null-argv-lib.so $(objpfx)tst-tlsalign: $(objpfx)tst-tlsalign-lib.so $(objpfx)tst-nodelete-opened.out: $(objpfx)tst-nodelete-opened-lib.so $(objpfx)tst-nodelete-opened: $(libdl) +$(objpfx)tst-noload: $(libdl) $(objpfx)tst-tlsalign-extern: $(objpfx)tst-tlsalign-vars.o $(objpfx)tst-tlsalign-extern-static: $(objpfx)tst-tlsalign-vars.o |