diff options
| author | Siddhesh Poyarekar <siddhesh@redhat.com> | 2015-07-16 08:53:28 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2015-07-16 08:53:28 +0530 |
| commit | b632bdd3f7c0ba0c79f23f5e4404eebb87ebdaa8 (patch) | |
| tree | ac6ac90ea020f5d02ee411528ce2d165ca4ecc11 /elf/Makefile | |
| parent | c59f721c7377106888bff47064bf7da5a082e129 (diff) | |
| download | glibc-b632bdd3f7c0ba0c79f23f5e4404eebb87ebdaa8.tar glibc-b632bdd3f7c0ba0c79f23f5e4404eebb87ebdaa8.tar.gz glibc-b632bdd3f7c0ba0c79f23f5e4404eebb87ebdaa8.tar.bz2 glibc-b632bdd3f7c0ba0c79f23f5e4404eebb87ebdaa8.zip | |
Set NODELETE flag when opening already open objects with RTLD_NODELETE
The DF_1_NODELETE flag is set too late when opening a DSO, due to
which, if a DSO is already open, subsequently opening it with
RTLD_NODELETE fails to set the DF_1_NODELETE flag. This patch fixes
this by setting the flag immediately after bumping the opencount.
Verified on x86_64.
[BZ #18676]
* elf/tst-nodelete-opened.c: New test case.
* elf/tst-nodelete-opened-lib.c: New test case module.
* elf/Makefile (tests, modules-names): Use them.
* elf/dl-open.c (dl_open_worker): Set DF_1_NODELETE flag
early.
Diffstat (limited to 'elf/Makefile')
| -rw-r--r-- | elf/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/elf/Makefile b/elf/Makefile index 90d50588e1..4ceeaf89be 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -148,7 +148,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ tst-unique1 tst-unique2 $(if $(CXX),tst-unique3 tst-unique4 \ tst-nodelete) \ tst-initorder tst-initorder2 tst-relsort1 tst-null-argv \ - tst-ptrguard1 tst-tlsalign tst-tlsalign-extern + tst-ptrguard1 tst-tlsalign tst-tlsalign-extern tst-nodelete-opened # reldep9 ifeq ($(build-hardcoded-path-in-tests),yes) tests += tst-dlopen-aout @@ -218,7 +218,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ tst-initorder2d \ tst-relsort1mod1 tst-relsort1mod2 tst-array2dep \ tst-array5dep tst-null-argv-lib \ - tst-tlsalign-lib + tst-tlsalign-lib tst-nodelete-opened-lib ifeq (yes,$(have-protected-data)) modules-names += tst-protected1moda tst-protected1modb tests += tst-protected1a tst-protected1b @@ -525,6 +525,8 @@ $(objpfx)tst-initordera4.so: $(objpfx)tst-initordera3.so $(objpfx)tst-initorder: $(objpfx)tst-initordera4.so $(objpfx)tst-initordera1.so $(objpfx)tst-initorderb2.so $(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-tlsalign-extern: $(objpfx)tst-tlsalign-vars.o $(objpfx)tst-tlsalign-extern-static: $(objpfx)tst-tlsalign-vars.o |