diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-06-25 08:09:08 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-06-25 08:09:08 +0200 |
| commit | 40ebfd016ad284872f434bdd76dbe9c708db4d6b (patch) | |
| tree | 139a40efc4402ec670eac545278e110561f3f2d3 /elf/dl-open.c | |
| parent | 66db95b6e8264c5a6307f6a9e5285fec76907254 (diff) | |
| download | glibc-40ebfd016ad284872f434bdd76dbe9c708db4d6b.tar glibc-40ebfd016ad284872f434bdd76dbe9c708db4d6b.tar.gz glibc-40ebfd016ad284872f434bdd76dbe9c708db4d6b.tar.bz2 glibc-40ebfd016ad284872f434bdd76dbe9c708db4d6b.zip | |
elf: Disable most of TLS modid gaps processing [BZ #27135]
Revert "elf: Fix DTV gap reuse logic [BZ #27135]"
This reverts commit 572bd547d57a39b6cf0ea072545dc4048921f4c3.
It turns out that the _dl_next_tls_modid in _dl_map_object_from_fd keeps
returning the same modid over and over again if there is a gap and
more than TLS-using module is loaded in one dlopen call. This corrupts
TLS data structures. The bug is still present after a revert, but
empirically it is much more difficult to trigger (because it involves a
dlopen failure).
Diffstat (limited to 'elf/dl-open.c')
| -rw-r--r-- | elf/dl-open.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/elf/dl-open.c b/elf/dl-open.c index d2240d8747..a066f39bd0 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -899,6 +899,16 @@ no more namespaces available for dlmopen()")); state if relocation failed, for example. */ if (args.map) { + /* Maybe some of the modules which were loaded use TLS. + Since it will be removed in the following _dl_close call + we have to mark the dtv array as having gaps to fill the + holes. This is a pessimistic assumption which won't hurt + if not true. There is no need to do this when we are + loading the auditing DSOs since TLS has not yet been set + up. */ + if ((mode & __RTLD_AUDIT) == 0) + GL(dl_tls_dtv_gaps) = true; + _dl_close_worker (args.map, true); /* All l_nodelete_pending objects should have been deleted |