RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix dlopen/dlsym regression opening libs already loaded at startup 

commit 4ff234f6cb erroneously changed
the condition for running certain code at dlopen time to check whether
the library was already relocated rather than whether it already had
its deps[] table filled. this was out of concern over whether the code
under the conditional would be idempotent/safe to call on an
already-loaded libraries. however, I missed a consideration in the
opposite direction: if a library was loaded at program startup rather
than dlopen, its deps[] table was not yet allocated/filled, and
load_deps needs to be called at dlopen time in order for dlsym to be
able to perform dependency-order symbol lookups.

in order to avoid wasteful allocation of lazy-binding relocation
tables for libraries which were already loaded and relocated at
startup, the check for !p->relocated is not deleted entirely, but
moved to apply only to allocation of these dables.
This commit is contained in:
Rich Felker 2017-03-21 08:35:59 -04:00
parent dbff2bb889
commit 0c53178ec0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ldso/dynlink.c
View File

@ -1768,9 +1768,9 @@ void *dlopen(const char *file, int mode)
}
/* First load handling */
if (!p->relocated) {
if (!p->deps) {
load_deps(p);
if ((mode & RTLD_LAZY)) {
if (!p->relocated && (mode & RTLD_LAZY)) {
prepare_lazy(p);
if (p->deps) for (i=0; p->deps[i]; i++)
if (!p->deps[i]->relocated)