summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rw-r--r--utils/Makefile2
-rw-r--r--utils/dl-cache.h34
-rw-r--r--utils/ldconfig.c17
-rw-r--r--utils/ldd.c112
4 files changed, 156 insertions, 9 deletions
diff --git a/utils/Makefile b/utils/Makefile
index 52308d09f..14b78762b 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -29,7 +29,7 @@ else
TARGET_ICONV =
endif
-XXFLAGS=$(LIBRARY_CACHE)
+XXFLAGS=
ifeq ($(strip $(LDSO_LDD_SUPPORT)),y)
XXFLAGS+= -D__LDSO_LDD_SUPPORT
endif
diff --git a/utils/dl-cache.h b/utils/dl-cache.h
new file mode 100644
index 000000000..ba7cd3f28
--- /dev/null
+++ b/utils/dl-cache.h
@@ -0,0 +1,34 @@
+#define LDSO_BASE_PATH UCLIBC_RUNTIME_PREFIX "etc/" __LDSO_BASE_FILENAME__
+#define LDSO_CONF LDSO_BASE_PATH ".conf"
+#define LDSO_CACHE LDSO_BASE_PATH ".cache"
+#define LDSO_PRELOAD LDSO_BASE_PATH ".preload"
+
+#define LIB_ANY -1
+#define LIB_DLL 0
+#define LIB_ELF 1
+#define LIB_ELF64 0x80
+#define LIB_ELF_LIBC5 2
+#define LIB_ELF_LIBC6 3
+#define LIB_ELF_LIBC0 4
+
+/* Definitions and prototypes for cache stuff */
+#ifdef __LDSO_CACHE_SUPPORT__
+
+#define LDSO_CACHE_MAGIC "ld.so-"
+#define LDSO_CACHE_MAGIC_LEN (sizeof LDSO_CACHE_MAGIC -1)
+#define LDSO_CACHE_VER "1.7.0"
+#define LDSO_CACHE_VER_LEN (sizeof LDSO_CACHE_VER -1)
+
+typedef struct {
+ char magic [LDSO_CACHE_MAGIC_LEN];
+ char version [LDSO_CACHE_VER_LEN];
+ int nlibs;
+} header_t;
+
+typedef struct {
+ int flags;
+ int sooffset;
+ int liboffset;
+} libentry_t;
+
+#endif
diff --git a/utils/ldconfig.c b/utils/ldconfig.c
index acb78a2ff..e466a42fb 100644
--- a/utils/ldconfig.c
+++ b/utils/ldconfig.c
@@ -503,7 +503,7 @@ void scan_dir(const char *rawname)
{
if (!lp->islink)
link_shlib(name, lp->name, lp->so);
-#ifdef USE_CACHE
+#ifdef __LDSO_CACHE_SUPPORT__
if (!nocache)
cache_dolib(name, lp->so, lp->libtype);
#endif
@@ -553,7 +553,7 @@ char *get_extpath(void)
return res;
}
-#ifdef USE_CACHE
+#ifdef __LDSO_CACHE_SUPPORT__
typedef struct liblist
{
int flags;
@@ -876,6 +876,9 @@ int main(int argc, char **argv)
{
scan_dir(UCLIBC_RUNTIME_PREFIX "lib");
scan_dir(UCLIBC_RUNTIME_PREFIX "usr/lib");
+#if !defined (__LDSO_CACHE_SUPPORT__)
+ scan_dir(UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib");
+#endif
/* I guess the defaults aren't good enough */
if ((extpath = get_extpath()))
@@ -886,8 +889,12 @@ int main(int argc, char **argv)
if (len)
while (cp[--len] == '/' && len)
cp[len] = 0;
- if (strcmp(UCLIBC_RUNTIME_PREFIX "lib", cp) == 0 ||
- strcmp(UCLIBC_RUNTIME_PREFIX "usr/lib", cp) == 0) {
+ if (strcmp(UCLIBC_RUNTIME_PREFIX "lib", cp) == 0
+ || strcmp(UCLIBC_RUNTIME_PREFIX "usr/lib", cp) == 0
+#if !defined (__LDSO_CACHE_SUPPORT__)
+ || strcmp(UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib", cp) == 0
+#endif
+ ) {
if (verbose >= 0)
warnx("Path `%s' given more than once\n", cp);
continue;
@@ -898,7 +905,7 @@ int main(int argc, char **argv)
}
}
-#ifdef USE_CACHE
+#ifdef __LDSO_CACHE_SUPPORT__
if (!nocache)
cache_write();
#endif
diff --git a/utils/ldd.c b/utils/ldd.c
index 48022cd8b..55433b601 100644
--- a/utils/ldd.c
+++ b/utils/ldd.c
@@ -45,6 +45,7 @@
#else
#include "elf.h"
#endif
+#include "dl-cache.h"
#ifdef DMALLOC
#include <dmalloc.h>
@@ -229,6 +230,89 @@ int check_elf_header(Elf32_Ehdr *const ehdr)
return 0;
}
+#ifdef __LDSO_CACHE_SUPPORT__
+static caddr_t cache_addr = NULL;
+static size_t cache_size = 0;
+
+int map_cache(void)
+{
+ int fd;
+ struct stat st;
+ header_t *header;
+ libentry_t *libent;
+ int i, strtabsize;
+
+ if (cache_addr == (caddr_t) - 1)
+ return -1;
+ else if (cache_addr != NULL)
+ return 0;
+
+ if (stat(LDSO_CACHE, &st)
+ || (fd = open(LDSO_CACHE, O_RDONLY, 0)) < 0) {
+ dprintf(2, "ldd: can't open cache '%s'\n", LDSO_CACHE);
+ cache_addr = (caddr_t) - 1; /* so we won't try again */
+ return -1;
+ }
+
+ cache_size = st.st_size;
+ cache_addr = (caddr_t) mmap(0, cache_size, PROT_READ, MAP_SHARED, fd, 0);
+ close(fd);
+ if (cache_addr == MAP_FAILED) {
+ dprintf(2, "ldd: can't map cache '%s'\n", LDSO_CACHE);
+ return -1;
+ }
+
+ header = (header_t *) cache_addr;
+
+ if (cache_size < sizeof(header_t) ||
+ memcmp(header->magic, LDSO_CACHE_MAGIC, LDSO_CACHE_MAGIC_LEN)
+ || memcmp(header->version, LDSO_CACHE_VER, LDSO_CACHE_VER_LEN)
+ || cache_size <
+ (sizeof(header_t) + header->nlibs * sizeof(libentry_t))
+ || cache_addr[cache_size - 1] != '\0')
+ {
+ dprintf(2, "ldd: cache '%s' is corrupt\n", LDSO_CACHE);
+ goto fail;
+ }
+
+ strtabsize = cache_size - sizeof(header_t) -
+ header->nlibs * sizeof(libentry_t);
+ libent = (libentry_t *) & header[1];
+
+ for (i = 0; i < header->nlibs; i++) {
+ if (libent[i].sooffset >= strtabsize ||
+ libent[i].liboffset >= strtabsize)
+ {
+ dprintf(2, "ldd: cache '%s' is corrupt\n", LDSO_CACHE);
+ goto fail;
+ }
+ }
+
+ return 0;
+
+fail:
+ munmap(cache_addr, cache_size);
+ cache_addr = (caddr_t) - 1;
+ return -1;
+}
+
+int unmap_cache(void)
+{
+ if (cache_addr == NULL || cache_addr == (caddr_t) - 1)
+ return -1;
+
+#if 1
+ munmap(cache_addr, cache_size);
+ cache_addr = NULL;
+#endif
+
+ return 0;
+}
+#else
+static inline void map_cache(void) { }
+static inline void unmap_cache(void) { }
+#endif
+
/* This function's behavior must exactly match that
* in uClibc/ldso/ldso/dl-elf.c */
static void search_for_named_library(char *name, char *result, const char *path_list)
@@ -320,8 +404,23 @@ void locate_library_file(Elf32_Ehdr* ehdr, Elf32_Dyn* dynamic, int is_suid, stru
}
}
-#ifdef USE_CACHE
- /* FIXME -- add code to check the Cache here */
+#ifdef __LDSO_CACHE_SUPPORT__
+ if (cache_addr != NULL && cache_addr != (caddr_t) - 1) {
+ int i;
+ header_t *header = (header_t *) cache_addr;
+ libentry_t *libent = (libentry_t *) & header[1];
+ char *strs = (char *) &libent[header->nlibs];
+
+ for (i = 0; i < header->nlibs; i++) {
+ if ((libent[i].flags == LIB_ELF ||
+ libent[i].flags == LIB_ELF_LIBC0 ||
+ libent[i].flags == LIB_ELF_LIBC5) &&
+ strcmp(lib->name, strs + libent[i].sooffset) == 0) {
+ lib->path = strdup(strs + libent[i].liboffset);
+ return;
+ }
+ }
+ }
#endif
@@ -339,7 +438,11 @@ void locate_library_file(Elf32_Ehdr* ehdr, Elf32_Dyn* dynamic, int is_suid, stru
/* Lastly, search the standard list of paths for the library.
This list must exactly match the list in uClibc/ldso/ldso/dl-elf.c */
path = UCLIBC_RUNTIME_PREFIX "lib:"
- UCLIBC_RUNTIME_PREFIX "usr/lib";
+ UCLIBC_RUNTIME_PREFIX "usr/lib"
+#if !defined (__LDSO_CACHE_SUPPORT__)
+ ":" UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib"
+#endif
+ ;
search_for_named_library(lib->name, buf, path);
if (*buf != '\0') {
lib->path = buf;
@@ -644,6 +747,8 @@ int main( int argc, char** argv)
printf("%s:\n", *argv);
}
+ map_cache();
+
if (find_dependancies(filename)!=0)
continue;
@@ -660,6 +765,7 @@ int main( int argc, char** argv)
}
}
+ unmap_cache();
/* Print the list */
got_em_all=0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 01:29:00 +0000