add support for $ORIGIN

This is for example required, used and tested with OpenJDK 7.
No regressions found, while running the testsuite with embedded-test.

diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h
index 6a89dff..ac4c57e 100644 (file)
--- a/ldso/include/dl-syscall.h
+++ b/ldso/include/dl-syscall.h
@@ -134,14 +134,10 @@ static __always_inline _syscall0(gid_t, _dl_getegid)
 #define __NR__dl_getpid __NR_getpid
 static __always_inline _syscall0(gid_t, _dl_getpid)
 
-#if defined __NR_readlinkat && !defined __NR_readlink
+#if defined __NR_readlinkat
 # define __NR__dl_readlink __NR_readlinkat
 static __always_inline _syscall4(int, _dl_readlink, int, id, const char *, path,
                                                char *, buf, size_t, bufsiz)
-#elif defined __NR_readlink
-# define __NR__dl_readlink __NR_readlink
-static __always_inline _syscall3(int, _dl_readlink, const char *, path, char *, buf,
-                        size_t, bufsiz)
 #endif
 
 #ifdef __NR_pread64

diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
index 54501d1..6fc95b3 100644 (file)
--- a/ldso/ldso/dl-elf.c
+++ b/ldso/ldso/dl-elf.c
@@ -133,56 +133,60 @@ _dl_protect_relro (struct elf_resolve *l)
  * in uClibc/ldso/util/ldd.c */
 static struct elf_resolve *
 search_for_named_library(const char *name, unsigned rflags, const char *path_list,
-       struct dyn_elf **rpnt)
+       struct dyn_elf **rpnt, const char* origin)
 {
-       char *path, *path_n, *mylibname;
+       char *mylibname;
        struct elf_resolve *tpnt;
-       int done;
+       const char *p, *pn;
+       int plen;
 
        if (path_list==NULL)
                return NULL;
 
-       /* We need a writable copy of this string, but we don't
-        * need this allocated permanently since we don't want
-        * to leak memory, so use alloca to put path on the stack */
-       done = _dl_strlen(path_list);
-       path = alloca(done + 1);
-
        /* another bit of local storage */
        mylibname = alloca(2050);
 
-       _dl_memcpy(path, path_list, done+1);
-
        /* Unlike ldd.c, don't bother to eliminate double //s */
 
        /* Replace colons with zeros in path_list */
        /* : at the beginning or end of path maps to CWD */
        /* :: anywhere maps CWD */
        /* "" maps to CWD */
-       done = 0;
-       path_n = path;
-       do {
-               if (*path == 0) {
-                       *path = ':';
-                       done = 1;
+       for (p = path_list; p != NULL; p = pn) {
+               pn = _dl_strchr(p + 1, ':');
+               if (pn != NULL) {
+                       plen = pn - p;
+                       pn++;
+               } else
+                       plen = _dl_strlen(p);
+
+               if (plen >= 7 && _dl_memcmp(p, "$ORIGIN", 7) == 0) {
+                       int olen;
+                       if (rflags && plen != 7)
+                               continue;
+                       if (origin == NULL)
+                               continue;
+                       for (olen = _dl_strlen(origin) - 1; olen >= 0 && origin[olen] != '/'; olen--)
+                               ;
+                       if (olen <= 0)
+                               continue;
+                       _dl_memcpy(&mylibname[0], origin, olen);
+                       _dl_memcpy(&mylibname[olen], p + 7, plen - 7);
+                       mylibname[olen + plen - 7] = 0;
+               } else if (plen != 0) {
+                       _dl_memcpy(mylibname, p, plen);
+                       mylibname[plen] = 0;
+               } else {
+                       _dl_strcpy(mylibname, ".");
                }
-               if (*path == ':') {
-                       *path = 0;
-                       if (*path_n)
-                               _dl_strcpy(mylibname, path_n);
-                       else
-                               _dl_strcpy(mylibname, "."); /* Assume current dir if empty path */
-                       _dl_strcat(mylibname, "/");
-                       _dl_strcat(mylibname, name);
+               _dl_strcat(mylibname, "/");
+               _dl_strcat(mylibname, name);
 #ifdef __LDSO_SAFE_RUNPATH__
-                       if (*mylibname == '/')
+               if (*mylibname == '/')
 #endif
-                               if ((tpnt = _dl_load_elf_shared_library(rflags, rpnt, mylibname)) != NULL)
-                                       return tpnt;
-                       path_n = path+1;
-               }
-               path++;
-       } while (!done);
+               if ((tpnt = _dl_load_elf_shared_library(rflags, rpnt, mylibname)) != NULL)
+                       return tpnt;
+       }
        return NULL;
 }
 
@@ -234,8 +238,10 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp
        if (pnt) {
                pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
                _dl_if_debug_dprint("\tsearching RPATH='%s'\n", pnt);
-               if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt)) != NULL)
+               if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt,
+                                                     tpnt->libname)) != NULL)
                        return tpnt1;
+
        }
 #endif
 
@@ -243,7 +249,7 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp
        /* Check in LD_{ELF_}LIBRARY_PATH, if specified and allowed */
        if (_dl_library_path) {
                _dl_if_debug_dprint("\tsearching LD_LIBRARY_PATH='%s'\n", _dl_library_path);
-               if ((tpnt1 = search_for_named_library(libname, rflags, _dl_library_path, rpnt)) != NULL)
+               if ((tpnt1 = search_for_named_library(libname, rflags, _dl_library_path, rpnt, NULL)) != NULL)
                {
                        return tpnt1;
                }
@@ -257,7 +263,7 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp
        if (pnt) {
                pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
                _dl_if_debug_dprint("\tsearching RUNPATH='%s'\n", pnt);
-               if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt)) != NULL)
+               if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt, NULL)) != NULL)
                        return tpnt1;
        }
 #endif
@@ -291,7 +297,7 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp
        /* Look for libraries wherever the shared library loader
         * was installed */
        _dl_if_debug_dprint("\tsearching ldso dir='%s'\n", _dl_ldsopath);
-       tpnt1 = search_for_named_library(libname, rflags, _dl_ldsopath, rpnt);
+       tpnt1 = search_for_named_library(libname, rflags, _dl_ldsopath, rpnt, NULL);
        if (tpnt1 != NULL)
                return tpnt1;
 #endif
@@ -304,7 +310,7 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp
 #ifndef __LDSO_CACHE_SUPPORT__
                                        ":" UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib"
 #endif
-                                       , rpnt);
+                                       , rpnt, NULL);
        if (tpnt1 != NULL)
                return tpnt1;
 

diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index 5619629..7367f17 100644 (file)
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -403,6 +403,20 @@ static ptrdiff_t _dl_build_local_scope (struct elf_resolve **list,
        return p - list;
 }
 
+static void _dl_setup_progname(const char *argv0)
+{
+       char image[PATH_MAX];
+       ssize_t s;
+
+       s = _dl_readlink(AT_FDCWD, "/proc/self/exe", image, sizeof(image));
+       if (s > 0 && image[0] == '/') {
+               image[s] = 0;
+               _dl_progname = _dl_strdup(image);
+       } else if (argv0) {
+               _dl_progname = argv0;
+       }
+}
+
 void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
                          ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp, char **argv
                          DL_GET_READY_TO_RUN_EXTRA_PARMS)
@@ -454,9 +468,7 @@ void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
         * been fixed up by now.  Still no function calls outside of this
         * library, since the dynamic resolver is not yet ready.
         */
-       if (argv[0]) {
-               _dl_progname = argv[0];
-       }
+       _dl_setup_progname(argv[0]);
 
 #ifdef __DSBT__
        _dl_ldso_dsbt = (void *)tpnt->dynamic_info[DT_DSBT_BASE_IDX];