diff options
author | Florian Weimer <fweimer@redhat.com> | 2019-10-17 19:58:57 +0200 |
---|---|---|
committer | Florian Weimer <fw@deneb.enyo.de> | 2019-10-28 14:30:41 +0100 |
commit | f0ead7b63b95ef1920197f50b6d4abf407f9ebe7 (patch) | |
tree | 10dffd0fdb1dd5a4e394599519f592d24f00688d /include/bits/mathcalls-narrow.h | |
parent | 7f1de8894be40772b9240563ea66c702014a1f96 (diff) | |
download | glibc-f0ead7b63b95ef1920197f50b6d4abf407f9ebe7.tar glibc-f0ead7b63b95ef1920197f50b6d4abf407f9ebe7.tar.gz glibc-f0ead7b63b95ef1920197f50b6d4abf407f9ebe7.tar.bz2 glibc-f0ead7b63b95ef1920197f50b6d4abf407f9ebe7.zip |
Avoid late failure in dlopen in global scope update [BZ #25112]
The call to add_to_global in dl_open_worker happens after running ELF
constructors for new objects. At this point, proper recovery from
malloc failure would be quite complicated: We would have to run the
ELF destructors and close all opened objects, something that we
currently do not do.
Instead, this change splits add_to_global into two phases,
add_to_global_prepare (which can raise an exception, called before ELF
constructors run), and add_to_global_finish (which cannot, called
after ELF constructors). A complication arises due to recursive
dlopen: After the inner dlopen consumes some space, the pre-allocation
in the outer dlopen may no longer be sufficient. A new member in the
namespace structure, _ns_global_scope_pending_adds keeps track of the
maximum number of objects that need to be added to the global scope.
This enables the inner add_to_global_prepare call to take into account
the needs of an outer dlopen.
Most code in the dynamic linker assumes that the number of global
scope entries fits into an unsigned int (matching the r_nlist member
of struct r_scop_elem). Therefore, change the type of
_ns_global_scope_alloc to unsigned int (from size_t), and add overflow
checks.
Tested on x86_64-linux-gnu and i686-linux-gnu.
Diffstat (limited to 'include/bits/mathcalls-narrow.h')
0 files changed, 0 insertions, 0 deletions