X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fldso%2Fdynlink.c;h=55c2bbe43429b75a17982eb88cb70ddfdc21dacd;hb=1af8c255040b3e1ba4913fd935d117490bfe8774;hp=820e8a36a3f88460681e26caa95f5bf7d09efe03;hpb=5c1909a8d210cd08a776a2fd6681dbea1f0ae480;p=musl

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 820e8a36..55c2bbe4 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -60,7 +60,7 @@ struct dso {
 	size_t map_len;
 	dev_t dev;
 	ino_t ino;
-	char global;
+	signed char global;
 	char relocated;
 	char constructed;
 	struct dso **deps;
@@ -268,23 +268,20 @@ static void *map_library(int fd, size_t *lenp, unsigned char **basep, size_t *dy
 		prot = (((ph->p_flags&PF_R) ? PROT_READ : 0) |
 			((ph->p_flags&PF_W) ? PROT_WRITE: 0) |
 			((ph->p_flags&PF_X) ? PROT_EXEC : 0));
-		if (mmap(base+this_min, this_max-this_min, prot, MAP_PRIVATE|MAP_FIXED, fd, off_start) == MAP_FAILED) {
-			munmap(map, map_len);
-			return 0;
-		}
+		if (mmap(base+this_min, this_max-this_min, prot, MAP_PRIVATE|MAP_FIXED, fd, off_start) == MAP_FAILED)
+			goto error;
 		if (ph->p_memsz > ph->p_filesz) {
 			size_t brk = (size_t)base+ph->p_vaddr+ph->p_filesz;
 			size_t pgbrk = brk+PAGE_SIZE-1 & -PAGE_SIZE;
 			memset((void *)brk, 0, pgbrk-brk & PAGE_SIZE-1);
-			if (pgbrk-(size_t)base < this_max && mmap((void *)pgbrk, (size_t)base+this_max-pgbrk, prot, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) == MAP_FAILED) {
-				munmap(map, map_len);
-				return 0;
-			}
+			if (pgbrk-(size_t)base < this_max && mmap((void *)pgbrk, (size_t)base+this_max-pgbrk, prot, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) == MAP_FAILED)
+				goto error;
 		}
 	}
 	for (i=0; ((size_t *)(base+dyn))[i]; i+=2)
 		if (((size_t *)(base+dyn))[i]==DT_TEXTREL) {
-			mprotect(map, map_len, PROT_READ|PROT_WRITE|PROT_EXEC);
+			if (mprotect(map, map_len, PROT_READ|PROT_WRITE|PROT_EXEC) < 0)
+				goto error;
 			break;
 		}
 	if (!runtime) reclaim_gaps(base, (void *)((char *)buf + eh->e_phoff),
@@ -293,6 +290,9 @@ static void *map_library(int fd, size_t *lenp, unsigned char **basep, size_t *dy
 	*basep = base;
 	*dynp = dyn;
 	return map;
+error:
+	munmap(map, map_len);
+	return 0;
 }
 
 static int path_open(const char *name, const char *search, char *buf, size_t buf_size)