RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2024-12-16 11:45:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

check for invalid handles in dlsym/dlclose

Browse Source 
this is wasteful and useless from a standpoint of sane programs, but
it is required by the standard, and the current requirements were
upheld with the closure of Austin Group issue #639:
http://austingroupbugs.net/view.php?id=639
This commit is contained in:
Rich Felker 2013-01-10 14:05:40 -05:00
parent d84923d89e
commit 6468fc9e37
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ldso/dynlink.c
View File

@ -1091,6 +1091,15 @@ end:
return p;
}
static int invalid_dso_handle(struct dso *h)
{
struct dso *p;
for (p=head; p; p=p->next) if (h==p) return 0;
snprintf(errbuf, sizeof errbuf, "Invalid library handle %p", (void *)h);
errflag = 1;
return 1;
}
static void *do_dlsym(struct dso *p, const char *s, void *ra)
{
size_t i;
@ -1110,6 +1119,7 @@ static void *do_dlsym(struct dso *p, const char *s, void *ra)
return __tls_get_addr((size_t []){def.dso->tls_id, def.sym->st_value});
return def.dso->base + def.sym->st_value;
}
if (invalid_dso_handle(p)) return 0;
if (p->ghashtab) {
gh = gnu_hash(s);
sym = gnu_lookup(s, gh, p);
@ -1236,6 +1246,12 @@ int dl_iterate_phdr(int(*callback)(struct dl_phdr_info *info, size_t size, void
return ret;
}
#else
static int invalid_dso_handle(struct dso *h)
{
snprintf(errbuf, sizeof errbuf, "Invalid library handle %p", (void *)h);
errflag = 1;
return 1;
}
void *dlopen(const char *file, int mode)
{
return 0;
@ -1259,5 +1275,5 @@ char *dlerror()
int dlclose(void *p)
{
return 0;
return invalid_dso_handle(p);
}