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

fix ldso reserved library name handling 

If a DT_NEEDED entry was the prefix of a reserved library name
(up to the first dot) then it was incorrectly treated as a libc
reserved name.

e.g. libp.so dependency was not loaded as it matched libpthread
reserved name.
This commit is contained in:
Szabolcs Nagy 2016-11-01 02:49:09 +01:00 committed by Rich Felker
parent 86e8cc0fd4
commit 5ffe515ca4
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ldso/dynlink.c
View File

@ -906,27 +906,27 @@ static struct dso *load_library(const char *name, struct dso *needed_by)
/* Catch and block attempts to reload the implementation itself */ /* Catch and block attempts to reload the implementation itself */
if (name[0]=='l' && name[1]=='i' && name[2]=='b') { if (name[0]=='l' && name[1]=='i' && name[2]=='b') {
static const char reserved[] = static const char reserved[] =
"c\0pthread\0rt\0m\0dl\0util\0xnet\0"; "c.pthread.rt.m.dl.util.xnet.";
const char *rp; const char *rp, *next;
char *z = strchr(name, '.'); for (rp=reserved; *rp; rp=next) {
if (z) { next = strchr(rp, '.') + 1;
size_t l = z-name; if (strncmp(name+3, rp, next-rp) == 0)
for (rp=reserved; *rp && strncmp(name+3, rp, l-3); rp+=strlen(rp)+1); break;
if (*rp) { }
if (ldd_mode) { if (*rp) {
/* Track which names have been resolved if (ldd_mode) {
* and only report each one once. */ /* Track which names have been resolved
static unsigned reported; * and only report each one once. */
unsigned mask = 1U<<(rp-reserved); static unsigned reported;
if (!(reported & mask)) { unsigned mask = 1U<<(rp-reserved);
reported |= mask; if (!(reported & mask)) {
dprintf(1, "\t%s => %s (%p)\n", reported |= mask;
name, ldso.name, dprintf(1, "\t%s => %s (%p)\n",
ldso.base); name, ldso.name,
} ldso.base);
} }
is_self = 1;
} }
is_self = 1;
} }
} }
if (!strcmp(name, ldso.name)) is_self = 1; if (!strcmp(name, ldso.name)) is_self = 1;