X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fldso%2Fdynlink.c;h=465fe4cf4aaa8547bb571e1348693110f5b321d4;hb=9f17413c753030811761d576fdb95f200bd818d7;hp=62dd9db78a5306089c6a09880b14ec58feeca41c;hpb=06933cc72445e12ee46b2930659eb5db0f9d6a43;p=musl

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 62dd9db7..465fe4cf 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -139,6 +139,37 @@ static void do_relocs(unsigned char *base, size_t *rel, size_t rel_size, size_t
 	}
 }
 
+/* A huge hack: to make up for the wastefulness of shared libraries
+ * needing at least a page of dirty memory even if they have no global
+ * data, we reclaim the gaps at the beginning and end of writable maps
+ * and "donate" them to the heap by setting up minimal malloc
+ * structures and then freeing them. */
+
+static void reclaim(unsigned char *base, size_t start, size_t end)
+{
+	size_t *a, *z;
+	start = start + 6*sizeof(size_t)-1 & -4*sizeof(size_t);
+	end = (end & -4*sizeof(size_t)) - 2*sizeof(size_t);
+	if (start>end || end-start < 4*sizeof(size_t)) return;
+	a = (size_t *)(base + start);
+	z = (size_t *)(base + end);
+	a[-2] = 1;
+	a[-1] = z[0] = end-start + 2*sizeof(size_t) | 1;
+	z[1] = 1;
+	free(a);
+}
+
+static void reclaim_gaps(unsigned char *base, Phdr *ph, size_t phent, size_t phcnt)
+{
+	for (; phcnt--; ph=(void *)((char *)ph+phent)) {
+		if (ph->p_type!=PT_LOAD) continue;
+		if ((ph->p_flags&(PF_R|PF_W))!=(PF_R|PF_W)) continue;
+		reclaim(base, ph->p_vaddr & -PAGE_SIZE, ph->p_vaddr);
+		reclaim(base, ph->p_vaddr+ph->p_memsz,
+			ph->p_vaddr+ph->p_memsz+PAGE_SIZE-1 & -PAGE_SIZE);
+	}
+}
+
 static void *map_library(int fd, size_t *lenp, unsigned char **basep, size_t *dynp)
 {
 	Ehdr buf[(896+sizeof(Ehdr))/sizeof(Ehdr)];
@@ -189,7 +220,7 @@ static void *map_library(int fd, size_t *lenp, unsigned char **basep, size_t *dy
 	 * the length of the file. This is okay because we will not
 	 * use the invalid part; we just need to reserve the right
 	 * amount of virtual address space to map over later. */
-	map = mmap(0, map_len, prot, MAP_PRIVATE, fd, off_start);
+	map = mmap((void *)addr_min, map_len, prot, MAP_PRIVATE, fd, off_start);
 	if (map==MAP_FAILED) return 0;
 	base = map - addr_min;
 	ph = (void *)((char *)buf + eh->e_phoff);
@@ -217,6 +248,13 @@ static void *map_library(int fd, size_t *lenp, unsigned char **basep, size_t *dy
 			}
 		}
 	}
+	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);
+			break;
+		}
+	if (!runtime) reclaim_gaps(base, (void *)((char *)buf + eh->e_phoff),
+		eh->e_phentsize, eh->e_phnum);
 	*lenp = map_len;
 	*basep = base;
 	*dynp = dyn;
@@ -398,6 +436,7 @@ void *__dynlink(int argc, char **argv, size_t *got)
 	size_t lib_dyn[DYN_CNT] = {0};
 	size_t i;
 	Phdr *phdr;
+	Ehdr *ehdr;
 	struct dso lib, app;
 
 	/* Find aux vector just past environ[] */
@@ -456,12 +495,18 @@ void *__dynlink(int argc, char **argv, size_t *got)
 
 	/* At this point the standard library is fully functional */
 
+	reclaim_gaps(app.base, (void *)aux[AT_PHDR], aux[AT_PHENT], aux[AT_PHNUM]);
+	ehdr = (void *)lib.base;
+	reclaim_gaps(lib.base, (void *)(lib.base+ehdr->e_phoff),
+		ehdr->e_phentsize, ehdr->e_phnum);
+
 	head = tail = &app;
 	libc = &lib;
 	app.next = 0;
 	load_deps(head);
 
 	make_global(head);
+	reloc_all(head->next);
 	reloc_all(head);
 
 	if (rtld_used) {
@@ -473,6 +518,7 @@ void *__dynlink(int argc, char **argv, size_t *got)
 		*libc->prev->next = *libc;
 		libc = libc->prev->next;
 		if (libc->next) libc->next->prev = libc;
+		if (tail == &lib) tail = libc;
 	} else {
 		free_all(head);
 		free(sys_path);