diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-06-25 10:54:12 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-07-14 15:10:27 -0300 |
| commit | ba33937be210da5d07f7f01709323743f66011ce (patch) | |
| tree | 8de2c3d81913a4e6b40b1f903078ce190d2f17be /sysdeps/generic/ldsodefs.h | |
| parent | 0e1f068108d94576321bbbd354cfb1b3b99389bf (diff) | |
| download | glibc-ba33937be210da5d07f7f01709323743f66011ce.tar glibc-ba33937be210da5d07f7f01709323743f66011ce.tar.gz glibc-ba33937be210da5d07f7f01709323743f66011ce.tar.bz2 glibc-ba33937be210da5d07f7f01709323743f66011ce.zip | |
elf: Fix DTV gap reuse logic (BZ #27135)
This is updated version of the 572bd547d57a (reverted by 40ebfd016ad2)
that fixes the _dl_next_tls_modid issues.
This issue with 572bd547d57a patch is the DTV entry will be only
update on dl_open_worker() with the update_tls_slotinfo() call after
all dependencies are being processed by _dl_map_object_deps(). However
_dl_map_object_deps() itself might call _dl_next_tls_modid(), and since
the _dl_tls_dtv_slotinfo_list::map is not yet set the entry will be
wrongly reused.
This patch fixes by renaming the _dl_next_tls_modid() function to
_dl_assign_tls_modid() and by passing the link_map so it can set
the slotinfo value so a subsequente _dl_next_tls_modid() call will
see the entry as allocated.
The intermediary value is cleared up on remove_slotinfo() for the case
a library fails to load with RTLD_NOW.
This patch fixes BZ #27135.
Checked on x86_64-linux-gnu.
Reviewed-by: Szabolcs Nagy <szabolcs.nagy@arm.com>
Diffstat (limited to 'sysdeps/generic/ldsodefs.h')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 176394de4d..9c15259236 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1171,8 +1171,8 @@ extern ElfW(Addr) _dl_sysdep_start (void **start_argptr, extern void _dl_sysdep_start_cleanup (void) attribute_hidden; -/* Determine next available module ID. */ -extern size_t _dl_next_tls_modid (void) attribute_hidden; +/* Determine next available module ID and set the L l_tls_modid. */ +extern void _dl_assign_tls_modid (struct link_map *l) attribute_hidden; /* Count the modules with TLS segments. */ extern size_t _dl_count_modids (void) attribute_hidden; |