Merge remote-tracking branch 'nsz/master'

[musl] / src / ldso / dynlink.c

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 0533bbb..02c880b 100644 (file)
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -38,15 +38,24 @@ typedef Elf64_Sym Sym;
 #define R_SYM(x) ((x)>>32)
 #endif
 
-struct dso
-{
+struct debug {
+       int ver;
+       void *head;
+       void (*bp)(void);
+       int state;
+       void *base;
+};
+
+struct dso {
+       unsigned char *base;
+       char *name;
+       size_t *dynv;
        struct dso *next, *prev;
+
        int refcnt;
-       size_t *dynv;
        Sym *syms;
        uint32_t *hashtab;
        char *strings;
-       unsigned char *base;
        unsigned char *map;
        size_t map_len;
        dev_t dev;
@@ -55,16 +64,21 @@ struct dso
        char relocated;
        char constructed;
        struct dso **deps;
-       char *name;
        char buf[];
 };
 
+void __init_ssp(size_t *);
+
 static struct dso *head, *tail, *libc;
 static char *env_path, *sys_path, *r_path;
 static int rtld_used;
+static int ssp_used;
 static int runtime;
 static jmp_buf rtld_fail;
 static pthread_rwlock_t lock;
+static struct debug debug;
+
+struct debug *_dl_debug_addr = &debug;
 
 #define AUX_CNT 24
 #define DYN_CNT 34
@@ -108,6 +122,7 @@ static void *find_sym(struct dso *dso, const char *s, int need_def)
        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;
        for (; dso; dso=dso->next) {
                Sym *sym;
                if (!dso->global) continue;
@@ -495,6 +510,10 @@ static void do_init_fini(struct dso *p)
        }
 }
 
+void _dl_debug_state(void)
+{
+}
+
 void *__dynlink(int argc, char **argv)
 {
        size_t *auxv, aux[AUX_CNT] = {0};
@@ -603,6 +622,18 @@ void *__dynlink(int argc, char **argv)
         * all memory used by the dynamic linker. */
        runtime = 1;
 
+       for (i=0; app->dynv[i]; i+=2)
+               if (app->dynv[i]==DT_DEBUG)
+                       app->dynv[i+1] = (size_t)&debug;
+       debug.ver = 1;
+       debug.bp = _dl_debug_state;
+       debug.head = head;
+       debug.base = lib->base;
+       debug.state = 0;
+       _dl_debug_state();
+
+       if (ssp_used) __init_ssp(auxv);
+
        do_init_fini(tail);
 
        if (!rtld_used) {
@@ -671,6 +702,8 @@ void *dlopen(const char *file, int mode)
                p->global = 1;
        }
 
+       _dl_debug_state();
+
        do_init_fini(tail);
 end:
        pthread_rwlock_unlock(&lock);
@@ -690,7 +723,7 @@ static void *do_dlsym(struct dso *p, const char *s, void *ra)
        }
        if (p == head || p == RTLD_DEFAULT) {
                void *res = find_sym(head, s, 0);
-               if (!res) errflag = 1;
+               if (!res) goto failed;
                return res;
        }
        h = hash(s);
@@ -703,6 +736,7 @@ static void *do_dlsym(struct dso *p, const char *s, void *ra)
                if (sym && sym->st_value && (1<<(sym->st_info&0xf) & OK_TYPES))
                        return p->deps[i]->base + sym->st_value;
        }
+failed:
        errflag = 1;
        snprintf(errbuf, sizeof errbuf, "Symbol not found: %s", s);
        return 0;