]> git.ipfire.org Git - thirdparty/glibc.git/commit - elf/Makefile
Clear DF_1_NODELETE flag only for failed to load library.
authorMaxim Ostapenko <m.ostapenko@partner.samsung.com>
Mon, 10 Aug 2015 07:47:54 +0000 (10:47 +0300)
committerAndreas Schwab <schwab@suse.de>
Tue, 11 Aug 2015 08:13:22 +0000 (10:13 +0200)
commitf25238ffe0455013174438376b3ee88df496f9d1
tree6cd3e27f694193ddc4f45258d09f1f4fb9f17801
parentdc8a7ff24dfd1fd97a50b4b83a715958b31e4b92
Clear DF_1_NODELETE flag only for failed to load library.

https://sourceware.org/bugzilla/show_bug.cgi?id=18778

If dlopen fails to load an object that has triggered loading libpthread it
causes ld.so to unload libpthread because its DF_1_NODELETE flags has been
forcefully cleared. The next call to __rtdl_unlock_lock_recursive will crash
since pthread_mutex_unlock no longer exists.

This patch moves l->l_flags_1 &= ~DF_1_NODELETE out of loop through all loaded
libraries and performs the action only on inconsistent one.

[BZ #18778]
* elf/Makefile (tests): Add Add tst-nodelete2.
(modules-names): Add tst-nodelete2mod.
(tst-nodelete2mod.so-no-z-defs): New.
($(objpfx)tst-nodelete2): Likewise.
($(objpfx)tst-nodelete2.out): Likewise.
(LDFLAGS-tst-nodelete2): Likewise.
* elf/dl-close.c (_dl_close_worker): Move DF_1_NODELETE clearing
out of loop through all loaded libraries.
* elf/tst-nodelete2.c: New file.
* elf/tst-nodelete2mod.c: Likewise.
ChangeLog
NEWS
elf/Makefile
elf/dl-close.c
elf/tst-nodelete2.c [new file with mode: 0644]
elf/tst-nodelete2mod.c [moved from elf/tst-znodelete-zlib.cc with 50% similarity]