summary refs log tree commit diff
path: root/elf/dl-tls.c
diff options
context:
space:
mode:
authorSzabolcs Nagy <szabolcs.nagy@arm.com>2020-12-31 13:59:38 +0000
committerSzabolcs Nagy <szabolcs.nagy@arm.com>2021-05-11 17:16:37 +0100
commit572bd547d57a39b6cf0ea072545dc4048921f4c3 (patch)
tree6a199fb5aebcced8309dc62206b01ab428bf524f /elf/dl-tls.c
parent9d0e30329c23b5ad736fda3f174208c25970dbce (diff)
downloadglibc-572bd547d57a39b6cf0ea072545dc4048921f4c3.tar.gz
glibc-572bd547d57a39b6cf0ea072545dc4048921f4c3.tar.xz
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-tls.c')
-rw-r--r--elf/dl-tls.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/elf/dl-tls.c b/elf/dl-tls.c
index dc69cd984e..67781bc108 100644
--- a/elf/dl-tls.c
+++ b/elf/dl-tls.c
@@ -191,10 +191,7 @@ _dl_next_tls_modid (void)
 size_t
 _dl_count_modids (void)
 {
-  /* It is rare that we have gaps; see elf/dl-open.c (_dl_open) where
-     we fail to load a module and unload it leaving a gap.  If we don't
-     have gaps then the number of modids is the current maximum so
-     return that.  */
+  /* The count is the max unless dlclose or failed dlopen created gaps.  */
   if (__glibc_likely (!GL(dl_tls_dtv_gaps)))
     return GL(dl_tls_max_dtv_idx);