diff options
| author | Maxim Ostapenko <m.ostapenko@partner.samsung.com> | 2015-08-10 10:47:54 +0300 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2015-08-11 10:13:22 +0200 |
| commit | f25238ffe0455013174438376b3ee88df496f9d1 (patch) | |
| tree | 6cd3e27f694193ddc4f45258d09f1f4fb9f17801 /ChangeLog | |
| parent | dc8a7ff24dfd1fd97a50b4b83a715958b31e4b92 (diff) | |
| download | glibc-f25238ffe0455013174438376b3ee88df496f9d1.zip glibc-f25238ffe0455013174438376b3ee88df496f9d1.tar.gz glibc-f25238ffe0455013174438376b3ee88df496f9d1.tar.bz2 | |
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.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 14 |
1 files changed, 14 insertions, 0 deletions
@@ -1,3 +1,17 @@ +2015-08-10 Maxim Ostapenko <m.ostapenko@partner.samsung.com> + + [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. + 2015-08-11 Andreas Schwab <schwab@suse.de> * sysdeps/unix/sysv/linux/openat.c (OPENAT_NOT_CANCEL): Don't define. |