diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-11-27 16:37:17 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-11-27 20:55:35 +0100 |
| commit | a509eb117fac1d764b15eba64993f4bdb63d7f3c (patch) | |
| tree | 072758cc02e49c7982abb01bc4a62106358188ad /sysdeps/generic | |
| parent | 440b7f8653e4ed8f6e1425145208050b795e9a6c (diff) | |
| download | glibc-a509eb117fac1d764b15eba64993f4bdb63d7f3c.tar glibc-a509eb117fac1d764b15eba64993f4bdb63d7f3c.tar.gz glibc-a509eb117fac1d764b15eba64993f4bdb63d7f3c.tar.bz2 glibc-a509eb117fac1d764b15eba64993f4bdb63d7f3c.zip | |
Avoid late dlopen failure due to scope, TLS slotinfo updates [BZ #25112]
This change splits the scope and TLS slotinfo updates in dlopen into
two parts: one to resize the data structures, and one to actually apply
the update. The call to add_to_global_resize in dl_open_worker is moved
before the demarcation point at which no further memory allocations are
allowed.
_dl_add_to_slotinfo is adjusted to make the list update optional. There
is some optimization possibility here because we could grow the slotinfo
list of arrays in a single call, one the largest TLS modid is known.
This commit does not fix the fatal meory allocation failure in
_dl_update_slotinfo. Ideally, this error during dlopen should be
recoverable.
The update order of scopes and TLS data structures is retained, although
it appears to be more correct to fully initialize TLS first, and then
expose symbols in the newly loaded objects via the scope update.
Tested on x86_64-linux-gnu.
Change-Id: I240c58387dabda3ca1bcab48b02115175fa83d6c
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index c0017b8a6d..fc25a81e1c 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1144,8 +1144,15 @@ extern void *_dl_open (const char *name, int mode, const void *caller, old scope, OLD can't be freed until no thread is using it. */ extern int _dl_scope_free (void *) attribute_hidden; -/* Add module to slot information data. */ -extern void _dl_add_to_slotinfo (struct link_map *l) attribute_hidden; + +/* Add module to slot information data. If DO_ADD is false, only the + required memory is allocated. Must be called with GL + (dl_load_lock) acquired. If the function has already been called + for the link map L with !do_add, then this function will not raise + an exception, otherwise it is possible that it encounters a memory + allocation failure. */ +extern void _dl_add_to_slotinfo (struct link_map *l, bool do_add) + attribute_hidden; /* Update slot information data for at least the generation of the module with the given index. */ |