X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fldso%2Fdynlink.c;h=9692c6b0138080f9a1d1da74403b9d6508977c36;hp=a171df977196c708c65819d5de885112d2f98644;hb=04109502c0355878d238bdba06a09b2593b2996f;hpb=649cec5f9868070b4d350b861ee7f68b03a552a8

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index a171df97..9692c6b0 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -22,8 +22,6 @@ static char errbuf[128];
 
 #ifdef SHARED
 
-#include "reloc.h"
-
 #if ULONG_MAX == 0xffffffff
 typedef Elf32_Ehdr Ehdr;
 typedef Elf32_Phdr Phdr;
@@ -68,6 +66,8 @@ struct dso {
 	char buf[];
 };
 
+#include "reloc.h"
+
 void __init_ssp(size_t *);
 
 static struct dso *head, *tail, *libc;
@@ -76,6 +76,7 @@ static int rtld_used;
 static int ssp_used;
 static int runtime;
 static int ldd_mode;
+static int ldso_fail;
 static jmp_buf rtld_fail;
 static pthread_rwlock_t lock;
 static struct debug debug;
@@ -105,9 +106,12 @@ static uint32_t hash(const char *s0)
 	return h & 0xfffffff;
 }
 
-static Sym *lookup(const char *s, uint32_t h, Sym *syms, uint32_t *hashtab, char *strings)
+static Sym *lookup(const char *s, uint32_t h, struct dso *dso)
 {
 	size_t i;
+	Sym *syms = dso->syms;
+	uint32_t *hashtab = dso->hashtab;
+	char *strings = dso->strings;
 	for (i=hashtab[2+h%hashtab[0]]; i; i=hashtab[2+hashtab[0]+i]) {
 		if (!strcmp(s, strings+syms[i].st_name))
 			return syms+i;
@@ -128,7 +132,7 @@ static void *find_sym(struct dso *dso, const char *s, int need_def)
 	for (; dso; dso=dso->next) {
 		Sym *sym;
 		if (!dso->global) continue;
-		sym = lookup(s, h, dso->syms, dso->hashtab, dso->strings);
+		sym = lookup(s, h, dso);
 		if (sym && (!need_def || sym->st_shndx) && sym->st_value
 		 && (1<<(sym->st_info&0xf) & OK_TYPES)
 		 && (1<<(sym->st_info>>4) & OK_BINDS)) {
@@ -140,8 +144,11 @@ static void *find_sym(struct dso *dso, const char *s, int need_def)
 	return def;
 }
 
-static void do_relocs(unsigned char *base, size_t *rel, size_t rel_size, size_t stride, Sym *syms, char *strings, struct dso *dso)
+static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stride)
 {
+	unsigned char *base = dso->base;
+	Sym *syms = dso->syms;
+	char *strings = dso->strings;
 	Sym *sym;
 	const char *name;
 	size_t sym_val, sym_size;
@@ -157,7 +164,7 @@ static void do_relocs(unsigned char *base, size_t *rel, size_t rel_size, size_t
 		if (sym_index) {
 			sym = syms + sym_index;
 			name = strings + sym->st_name;
-			ctx = IS_COPY(type) ? dso->next : dso;
+			ctx = IS_COPY(type) ? head->next : head;
 			sym_val = (size_t)find_sym(ctx, name, IS_PLT(type));
 			if (!sym_val && sym->st_info>>4 != STB_WEAK) {
 				snprintf(errbuf, sizeof errbuf,
@@ -165,9 +172,12 @@ static void do_relocs(unsigned char *base, size_t *rel, size_t rel_size, size_t
 					dso->name, name);
 				if (runtime) longjmp(rtld_fail, 1);
 				dprintf(2, "%s\n", errbuf);
-				_exit(127);
+				ldso_fail = 1;
+				continue;
 			}
 			sym_size = sym->st_size;
+		} else {
+			sym_val = sym_size = 0;
 		}
 		do_single_reloc(reloc_addr, type, sym_val, sym_size, base, rel[2]);
 	}
@@ -442,7 +452,8 @@ static void load_deps(struct dso *p)
 					p->strings + p->dynv[i+1], p->name);
 				if (runtime) longjmp(rtld_fail, 1);
 				dprintf(2, "%s\n", errbuf);
-				_exit(127);
+				ldso_fail = 1;
+				continue;
 			}
 			if (runtime) {
 				tmp = realloc(*deps, sizeof(*tmp)*(ndeps+2));
@@ -481,12 +492,13 @@ static void reloc_all(struct dso *p)
 	for (; p; p=p->next) {
 		if (p->relocated) continue;
 		decode_vec(p->dynv, dyn, DYN_CNT);
-		do_relocs(p->base, (void *)(p->base+dyn[DT_JMPREL]), dyn[DT_PLTRELSZ],
-			2+(dyn[DT_PLTREL]==DT_RELA), p->syms, p->strings, head);
-		do_relocs(p->base, (void *)(p->base+dyn[DT_REL]), dyn[DT_RELSZ],
-			2, p->syms, p->strings, head);
-		do_relocs(p->base, (void *)(p->base+dyn[DT_RELA]), dyn[DT_RELASZ],
-			3, p->syms, p->strings, head);
+#ifdef NEED_ARCH_RELOCS
+		do_arch_relocs(p, head);
+#endif
+		do_relocs(p, (void *)(p->base+dyn[DT_JMPREL]), dyn[DT_PLTRELSZ],
+			2+(dyn[DT_PLTREL]==DT_RELA));
+		do_relocs(p, (void *)(p->base+dyn[DT_REL]), dyn[DT_RELSZ], 2);
+		do_relocs(p, (void *)(p->base+dyn[DT_RELA]), dyn[DT_RELASZ], 3);
 		p->relocated = 1;
 	}
 }
@@ -673,6 +685,7 @@ void *__dynlink(int argc, char **argv)
 	reloc_all(app->next);
 	reloc_all(app);
 
+	if (ldso_fail) _exit(127);
 	if (ldd_mode) _exit(0);
 
 	/* Switch to runtime mode: any further failures in the dynamic
@@ -681,9 +694,11 @@ void *__dynlink(int argc, char **argv)
 	 * all memory used by the dynamic linker. */
 	runtime = 1;
 
+#ifndef DYNAMIC_IS_RO
 	for (i=0; app->dynv[i]; i+=2)
 		if (app->dynv[i]==DT_DEBUG)
 			app->dynv[i+1] = (size_t)&debug;
+#endif
 	debug.ver = 1;
 	debug.bp = _dl_debug_state;
 	debug.head = head;
@@ -788,12 +803,11 @@ static void *do_dlsym(struct dso *p, const char *s, void *ra)
 		return res;
 	}
 	h = hash(s);
-	sym = lookup(s, h, p->syms, p->hashtab, p->strings);
+	sym = lookup(s, h, p);
 	if (sym && sym->st_value && (1<<(sym->st_info&0xf) & OK_TYPES))
 		return p->base + sym->st_value;
 	if (p->deps) for (i=0; p->deps[i]; i++) {
-		sym = lookup(s, h, p->deps[i]->syms,
-			p->deps[i]->hashtab, p->deps[i]->strings);
+		sym = lookup(s, h, p->deps[i]);
 		if (sym && sym->st_value && (1<<(sym->st_info&0xf) & OK_TYPES))
 			return p->deps[i]->base + sym->st_value;
 	}