fix uninitialized map_len being used in munmap failure paths in load_library

this bug seems to have been introduced when the map_library signatures
was changed to return the mapping in a temp dso structure instead of
into separate variables.

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index b1a4409dc17c1066e6774d7e045e7b2c5d576b06..efbec8fbc28ca72e7dd3977597752e0513ae9cb4 100644 (file)
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -435,7 +435,6 @@ static struct dso *load_library(const char *name)
        char buf[2*NAME_MAX+2];
        const char *pathname;
        unsigned char *map;
-       size_t map_len;
        struct dso *p, temp_dso = {0};
        int fd;
        struct stat st;
@@ -528,7 +527,7 @@ static struct dso *load_library(const char *name)
        }
        p = calloc(1, alloc_size);
        if (!p) {
-               munmap(map, map_len);
+               munmap(map, temp_dso.map_len);
                return 0;
        }
        memcpy(p, &temp_dso, sizeof temp_dso);
@@ -542,8 +541,8 @@ static struct dso *load_library(const char *name)
        if (pathname != name) p->shortname = strrchr(p->name, '/')+1;
        if (p->tls_image) {
                if (runtime && !__pthread_self_init()) {
+                       munmap(map, p->map_len);
                        free(p);
-                       munmap(map, map_len);
                        return 0;
                }
                p->tls_id = ++tls_cnt;