diff options
author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2020-12-31 13:59:38 +0000 |
---|---|---|
committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2021-05-11 17:16:37 +0100 |
commit | 572bd547d57a39b6cf0ea072545dc4048921f4c3 (patch) | |
tree | 6a199fb5aebcced8309dc62206b01ab428bf524f /elf/dl-close.c | |
parent | 9d0e30329c23b5ad736fda3f174208c25970dbce (diff) | |
download | glibc-572bd547d57a39b6cf0ea072545dc4048921f4c3.tar glibc-572bd547d57a39b6cf0ea072545dc4048921f4c3.tar.gz glibc-572bd547d57a39b6cf0ea072545dc4048921f4c3.tar.bz2 glibc-572bd547d57a39b6cf0ea072545dc4048921f4c3.zip |
elf: Fix DTV gap reuse logic [BZ #27135]
For some reason only dlopen failure caused dtv gaps to be reused.
It is possible that the intent was to never reuse modids for a
different module, but after dlopen failure all gaps are reused
not just the ones caused by the unfinished dlopened.
So the code has to handle reused modids already which seems to
work, however the data races at thread creation and tls access
(see bug 19329 and bug 27111) may be more severe if slots are
reused so this is scheduled after those fixes. I think fixing
the races are not simpler if reuse is disallowed and reuse has
other benefits, so set GL(dl_tls_dtv_gaps) whenever entries are
removed from the middle of the slotinfo list. The value does
not have to be correct: incorrect true value causes the next
modid query to do a slotinfo walk, incorrect false will leave
gaps and new entries are added at the end.
Fixes bug 27135.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'elf/dl-close.c')
-rw-r--r-- | elf/dl-close.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/elf/dl-close.c b/elf/dl-close.c index 3720e47dd1..9f31532f41 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -88,7 +88,11 @@ remove_slotinfo (size_t idx, struct dtv_slotinfo_list *listp, size_t disp, /* If this is not the last currently used entry no need to look further. */ if (idx != GL(dl_tls_max_dtv_idx)) - return true; + { + /* There is an unused dtv entry in the middle. */ + GL(dl_tls_dtv_gaps) = true; + return true; + } } while (idx - disp > (disp == 0 ? 1 + GL(dl_tls_static_nelem) : 0)) |