#ifdef SHARED
-#include "reloc.h"
-
#if ULONG_MAX == 0xffffffff
typedef Elf32_Ehdr Ehdr;
typedef Elf32_Phdr Phdr;
int refcnt;
Sym *syms;
uint32_t *hashtab;
+ uint32_t *ghashtab;
char *strings;
unsigned char *map;
size_t map_len;
char buf[];
};
+#include "reloc.h"
+
void __init_ssp(size_t *);
static struct dso *head, *tail, *libc;
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;
+static size_t *auxv;
struct debug *_dl_debug_addr = &debug;
}
}
-static uint32_t hash(const char *s0)
+static int search_vec(size_t *v, size_t *r, size_t key)
+{
+ for (; v[0]!=key; v+=2)
+ if (!v[0]) return 0;
+ *r = v[1];
+ return 1;
+}
+
+static uint32_t sysv_hash(const char *s0)
{
const unsigned char *s = (void *)s0;
uint_fast32_t h = 0;
return h & 0xfffffff;
}
-static Sym *lookup(const char *s, uint32_t h, struct dso *dso)
+static uint32_t gnu_hash(const char *s0)
+{
+ const unsigned char *s = (void *)s0;
+ uint_fast32_t h = 5381;
+ for (; *s; s++)
+ h = h*33 + *s;
+ return h;
+}
+
+static Sym *sysv_lookup(const char *s, uint32_t h, struct dso *dso)
{
size_t i;
Sym *syms = dso->syms;
return 0;
}
+static Sym *gnu_lookup(const char *s, uint32_t h1, struct dso *dso)
+{
+ Sym *sym;
+ char *strings;
+ uint32_t *hashtab = dso->ghashtab;
+ uint32_t nbuckets = hashtab[0];
+ uint32_t *buckets = hashtab + 4 + hashtab[2]*(sizeof(size_t)/4);
+ uint32_t h2;
+ uint32_t *hashval;
+ uint32_t n = buckets[h1 % nbuckets];
+
+ if (!n) return 0;
+
+ strings = dso->strings;
+ sym = dso->syms + n;
+ hashval = buckets + nbuckets + (n - hashtab[1]);
+
+ for (h1 |= 1; ; sym++) {
+ h2 = *hashval++;
+ if ((h1 == (h2|1)) && !strcmp(s, strings + sym->st_name))
+ return sym;
+ if (h2 & 1) break;
+ }
+
+ return 0;
+}
+
#define OK_TYPES (1<<STT_NOTYPE | 1<<STT_OBJECT | 1<<STT_FUNC | 1<<STT_COMMON)
#define OK_BINDS (1<<STB_GLOBAL | 1<<STB_WEAK)
static void *find_sym(struct dso *dso, const char *s, int need_def)
{
- uint32_t h = hash(s);
+ uint32_t h = 0, gh = 0;
void *def = 0;
- if (h==0x6b366be && !strcmp(s, "dlopen")) rtld_used = 1;
- if (h==0x6b3afd && !strcmp(s, "dlsym")) rtld_used = 1;
- if (h==0x595a4cc && !strcmp(s, "__stack_chk_fail")) ssp_used = 1;
+ if (dso->ghashtab) {
+ gh = gnu_hash(s);
+ if (gh == 0xf9040207 && !strcmp(s, "dlopen")) rtld_used = 1;
+ if (gh == 0xf4dc4ae && !strcmp(s, "dlsym")) rtld_used = 1;
+ if (gh == 0x1f4039c9 && !strcmp(s, "__stack_chk_fail")) ssp_used = 1;
+ } else {
+ h = sysv_hash(s);
+ if (h == 0x6b366be && !strcmp(s, "dlopen")) rtld_used = 1;
+ if (h == 0x6b3afd && !strcmp(s, "dlsym")) rtld_used = 1;
+ if (h == 0x595a4cc && !strcmp(s, "__stack_chk_fail")) ssp_used = 1;
+ }
for (; dso; dso=dso->next) {
Sym *sym;
if (!dso->global) continue;
- sym = lookup(s, h, dso);
+ if (dso->ghashtab) {
+ if (!gh) gh = gnu_hash(s);
+ sym = gnu_lookup(s, gh, dso);
+ } else {
+ if (!h) h = sysv_hash(s);
+ sym = sysv_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)) {
return def;
}
-static void do_relocs(unsigned char *base, size_t *rel, size_t rel_size, size_t stride, Sym *syms, char *strings)
+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;
if (!sym_val && sym->st_info>>4 != STB_WEAK) {
snprintf(errbuf, sizeof errbuf,
"Error relocating %s: %s: symbol not found",
- "???", name);
+ 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]);
}
size_t dyn[DYN_CNT] = {0};
decode_vec(p->dynv, dyn, DYN_CNT);
p->syms = (void *)(p->base + dyn[DT_SYMTAB]);
- p->hashtab = (void *)(p->base + dyn[DT_HASH]);
p->strings = (void *)(p->base + dyn[DT_STRTAB]);
+ if (dyn[0]&(1<<DT_HASH))
+ p->hashtab = (void *)(p->base + dyn[DT_HASH]);
+ if (search_vec(p->dynv, dyn, DT_GNU_HASH))
+ p->ghashtab = (void *)(p->base + *dyn);
}
static struct dso *load_library(const char *name)
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));
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);
- do_relocs(p->base, (void *)(p->base+dyn[DT_REL]), dyn[DT_RELSZ],
- 2, p->syms, p->strings);
- do_relocs(p->base, (void *)(p->base+dyn[DT_RELA]), dyn[DT_RELASZ],
- 3, p->syms, p->strings);
+#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;
}
}
void *__dynlink(int argc, char **argv)
{
- size_t *auxv, aux[AUX_CNT] = {0};
+ size_t aux[AUX_CNT] = {0};
size_t i;
Phdr *phdr;
Ehdr *ehdr;
struct dso *const lib = builtin_dsos+1;
struct dso *const vdso = builtin_dsos+2;
char *env_preload=0;
+ size_t vdso_base;
/* Find aux vector just past environ[] */
for (i=argc+1; argv[i]; i++)
decode_dyn(app);
/* Attach to vdso, if provided by the kernel */
- for (i=0; auxv[i]; i+=2) {
- size_t vdso_base = auxv[i+1];
- if (auxv[i] != AT_SYSINFO_EHDR) continue;
+ if (search_vec(auxv, &vdso_base, AT_SYSINFO_EHDR)) {
ehdr = (void *)vdso_base;
phdr = (void *)(vdso_base + ehdr->e_phoff);
for (i=ehdr->e_phnum; i; i--, phdr=(void *)((char *)phdr + ehdr->e_phentsize)) {
decode_dyn(vdso);
vdso->prev = lib;
lib->next = vdso;
- break;
}
/* Initial dso chain consists only of the app. We temporarily
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
* 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;
p->global = 1;
}
+ if (ssp_used) __init_ssp(auxv);
+
_dl_debug_state();
do_init_fini(tail);
static void *do_dlsym(struct dso *p, const char *s, void *ra)
{
size_t i;
- uint32_t h;
+ uint32_t h = 0, gh = 0;
Sym *sym;
if (p == RTLD_NEXT) {
for (p=head; p && (unsigned char *)ra-p->map>p->map_len; p=p->next);
if (!res) goto failed;
return res;
}
- h = hash(s);
- sym = lookup(s, h, p);
+ if (p->ghashtab) {
+ gh = gnu_hash(s);
+ sym = gnu_lookup(s, gh, p);
+ } else {
+ h = sysv_hash(s);
+ sym = sysv_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);
+ if (p->deps[i]->ghashtab) {
+ if (!gh) gh = gnu_hash(s);
+ sym = gnu_lookup(s, h, p->deps[i]);
+ } else {
+ if (!h) h = sysv_hash(s);
+ sym = sysv_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;
}
projects / musl / blobdiff