From: Rich Felker <dalias@aerifal.cx>
Date: Thu, 10 Jan 2013 19:05:40 +0000 (-0500)
Subject: check for invalid handles in dlsym/dlclose
X-Git-Tag: v0.9.9~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6468fc9e37fd7a12c1406c03aa7c6b5e869d799b;p=oweals%2Fmusl.git

check for invalid handles in dlsym/dlclose

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
---

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 935367e3..782e979f 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -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);
 }