make dlerror produce informative results

[musl] / src / ldso / dynlink.c

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 057a4cd..0533bbb 100644 (file)
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -1,4 +1,3 @@
-#ifdef __PIC__
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -18,6 +17,11 @@
 #include <ctype.h>
 #include <dlfcn.h>
 
+static int errflag;
+static char errbuf[128];
+
+#ifdef __PIC__
+
 #include "reloc.h"
 
 #if ULONG_MAX == 0xffffffff
@@ -47,8 +51,9 @@ struct dso
        size_t map_len;
        dev_t dev;
        ino_t ino;
-       int global;
-       int relocated;
+       char global;
+       char relocated;
+       char constructed;
        struct dso **deps;
        char *name;
        char buf[];
@@ -138,8 +143,11 @@ static void do_relocs(unsigned char *base, size_t *rel, size_t rel_size, size_t
                        ctx = IS_COPY(type) ? dso->next : dso;
                        sym_val = (size_t)find_sym(ctx, name, IS_PLT(type));
                        if (!sym_val && sym->st_info>>4 != STB_WEAK) {
+                               snprintf(errbuf, sizeof errbuf,
+                                       "Error relocating %s: %s: symbol not found",
+                                       dso->name, name);
                                if (runtime) longjmp(rtld_fail, 1);
-                               dprintf(2, "%s: symbol not found\n", name);
+                               dprintf(2, "%s\n", errbuf);
                                _exit(127);
                        }
                        sym_size = sym->st_size;
@@ -401,9 +409,11 @@ static void load_deps(struct dso *p)
                        if (p->dynv[i] != DT_NEEDED) continue;
                        dep = load_library(p->strings + p->dynv[i+1]);
                        if (!dep) {
-                               if (runtime) longjmp(rtld_fail, 1);
-                               dprintf(2, "%s: %m (needed by %s)\n",
+                               snprintf(errbuf, sizeof errbuf,
+                                       "Error loading shared library %s: %m (needed by %s)",
                                        p->strings + p->dynv[i+1], p->name);
+                               if (runtime) longjmp(rtld_fail, 1);
+                               dprintf(2, "%s\n", errbuf);
                                _exit(127);
                        }
                        if (runtime) {
@@ -471,6 +481,20 @@ static size_t find_dyn(Phdr *ph, size_t cnt, size_t stride)
        return 0;
 }
 
+static void do_init_fini(struct dso *p)
+{
+       size_t dyn[DYN_CNT] = {0};
+       for (; p; p=p->prev) {
+               if (p->constructed) return;
+               decode_vec(p->dynv, dyn, DYN_CNT);
+               if (dyn[0] & (1<<DT_FINI))
+                       atexit((void (*)(void))(p->base + dyn[DT_FINI]));
+               if (dyn[0] & (1<<DT_INIT))
+                       ((void (*)(void))(p->base + dyn[DT_INIT]))();
+               p->constructed = 1;
+       }
+}
+
 void *__dynlink(int argc, char **argv)
 {
        size_t *auxv, aux[AUX_CNT] = {0};
@@ -520,6 +544,7 @@ void *__dynlink(int argc, char **argv)
        }
        app->name = argv[0];
        app->global = 1;
+       app->constructed = 1;
        app->dynv = (void *)(app->base + find_dyn(
                (void *)aux[AT_PHDR], aux[AT_PHNUM], aux[AT_PHENT]));
        decode_dyn(app);
@@ -577,6 +602,9 @@ void *__dynlink(int argc, char **argv)
         * error. If the dynamic loader (dlopen) will not be used, free
         * all memory used by the dynamic linker. */
        runtime = 1;
+
+       do_init_fini(tail);
+
        if (!rtld_used) {
                free_all(head);
                free(sys_path);
@@ -591,9 +619,11 @@ void *dlopen(const char *file, int mode)
 {
        struct dso *volatile p, *orig_tail = tail, *next;
        size_t i;
+       int cs;
 
        if (!file) return head;
 
+       pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
        pthread_rwlock_wrlock(&lock);
 
        if (setjmp(rtld_fail)) {
@@ -609,12 +639,17 @@ void *dlopen(const char *file, int mode)
                }
                tail = orig_tail;
                tail->next = 0;
-               pthread_rwlock_unlock(&lock);
-               return 0;
-       }
+               p = 0;
+               errflag = 1;
+               goto end;
+       } else p = load_library(file);
 
-       p = load_library(file);
-       if (!p) goto end;
+       if (!p) {
+               snprintf(errbuf, sizeof errbuf,
+                       "Error loading shared library %s: %m", file);
+               errflag = 1;
+               goto end;
+       }
 
        /* First load handling */
        if (!p->deps) {
@@ -636,8 +671,10 @@ void *dlopen(const char *file, int mode)
                p->global = 1;
        }
 
+       do_init_fini(tail);
 end:
        pthread_rwlock_unlock(&lock);
+       pthread_setcancelstate(cs, 0);
        return p;
 }
 
@@ -651,8 +688,11 @@ static void *do_dlsym(struct dso *p, const char *s, void *ra)
                if (!p) p=head;
                p=p->next;
        }
-       if (p == head || p == RTLD_DEFAULT)
-               return find_sym(head, s, 0);
+       if (p == head || p == RTLD_DEFAULT) {
+               void *res = find_sym(head, s, 0);
+               if (!res) errflag = 1;
+               return res;
+       }
        h = hash(s);
        sym = lookup(s, h, p->syms, p->hashtab, p->strings);
        if (sym && sym->st_value && (1<<(sym->st_info&0xf) & OK_TYPES))
@@ -663,6 +703,8 @@ 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;
        }
+       errflag = 1;
+       snprintf(errbuf, sizeof errbuf, "Symbol not found: %s", s);
        return 0;
 }
 
@@ -687,7 +729,9 @@ void *__dlsym(void *p, const char *s, void *ra)
 
 char *dlerror()
 {
-       return "unknown error";
+       if (!errflag) return 0;
+       errflag = 0;
+       return errbuf;
 }
 
 int dlclose(void *p)