diff options
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-deps.c | 5 | ||||
| -rw-r--r-- | elf/dl-load.c | 24 | ||||
| -rw-r--r-- | elf/dl-open.c | 4 | ||||
| -rw-r--r-- | elf/dl-runtime.c | 2 | ||||
| -rw-r--r-- | elf/link.h | 5 | ||||
| -rw-r--r-- | elf/rtld.c | 41 |
6 files changed, 54 insertions, 27 deletions
diff --git a/elf/dl-deps.c b/elf/dl-deps.c index 8521c50d25..c310a5b82d 100644 --- a/elf/dl-deps.c +++ b/elf/dl-deps.c @@ -24,7 +24,8 @@ Cambridge, MA 02139, USA. */ void _dl_map_object_deps (struct link_map *map, - struct link_map **preloads, unsigned int npreloads) + struct link_map **preloads, unsigned int npreloads, + int trace_mode) { struct list { @@ -75,7 +76,7 @@ _dl_map_object_deps (struct link_map *map, struct link_map *dep = _dl_map_object (l, strtab + d->d_un.d_val, l->l_type == lt_executable ? lt_library : - l->l_type); + l->l_type, trace_mode); if (dep->l_reserved) /* This object is already in the search list we are diff --git a/elf/dl-load.c b/elf/dl-load.c index 9dfc961a2f..1a86cccb89 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -477,7 +477,8 @@ open_path (const char *name, size_t namelen, /* Map in the shared object file NAME. */ struct link_map * -_dl_map_object (struct link_map *loader, const char *name, int type) +_dl_map_object (struct link_map *loader, const char *name, int type, + int trace_mode) { int fd; char *realname; @@ -582,7 +583,26 @@ _dl_map_object (struct link_map *loader, const char *name, int type) } if (fd == -1) - _dl_signal_error (errno, name, "cannot open shared object file"); + { + if (trace_mode) + { + /* We haven't found an appropriate library. But since we + are only interested in the list of libraries this isn't + so severe. Fake an entry with all the information we + have (in fact only the name). */ + + /* Enter the new object in the list of loaded objects. */ + if ((name_copy = local_strdup (name)) == NULL + || (l = _dl_new_object (name_copy, name, type)) == NULL) + _dl_signal_error (ENOMEM, name, + "cannot create shared object descriptor"); + /* We use an opencount of 0 as a sign for the faked entry. */ + l->l_opencount = 0; + l->l_reserved = 0; + } + else + _dl_signal_error (errno, name, "cannot open shared object file"); + } return _dl_map_object_from_fd (name_copy, fd, realname, loader, type); } diff --git a/elf/dl-open.c b/elf/dl-open.c index 25f2ba6fab..8f4f9f5015 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -46,13 +46,13 @@ _dl_open (const char *file, int mode) struct r_debug *r; /* Load the named object. */ - new = _dl_map_object (NULL, file, lt_loaded); + new = _dl_map_object (NULL, file, lt_loaded, 0); if (new->l_searchlist) /* It was already open. */ return new; /* Load that object's dependencies. */ - _dl_map_object_deps (new, NULL, 0); + _dl_map_object_deps (new, NULL, 0, 0); /* Relocate the objects loaded. We do this in reverse order so that copy diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c index 4e7b5296d4..2a186f2d0b 100644 --- a/elf/dl-runtime.c +++ b/elf/dl-runtime.c @@ -41,7 +41,7 @@ _dl_object_relocation_scope (struct link_map *l) if (! l->l_searchlist) /* We must construct the searchlist for this object. */ - _dl_map_object_deps (l, NULL, 0); + _dl_map_object_deps (l, NULL, 0, 0); /* The primary scope is this object itself and its dependencies. */ diff --git a/elf/link.h b/elf/link.h index a6281726c3..1e3828afbb 100644 --- a/elf/link.h +++ b/elf/link.h @@ -195,7 +195,8 @@ extern int _dlerror_run (void (*operate) (void)); LOADER's DT_RPATH is used in searching for NAME. If the object is already opened, returns its existing map. */ extern struct link_map *_dl_map_object (struct link_map *loader, - const char *name, int type); + const char *name, int type, + int trace_mode); /* Call _dl_map_object on the dependencies of MAP, and set up MAP->l_searchlist. PRELOADS points to a vector of NPRELOADS previously @@ -203,7 +204,7 @@ extern struct link_map *_dl_map_object (struct link_map *loader, but before its dependencies. */ extern void _dl_map_object_deps (struct link_map *map, struct link_map **preloads, - unsigned int npreloads); + unsigned int npreloads, int trace_mode); /* Cache the locations of MAP's hash table. */ extern void _dl_setup_hash (struct link_map *map); diff --git a/elf/rtld.c b/elf/rtld.c index 58676924e5..1fae3488d9 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -149,6 +149,9 @@ dl_main (const ElfW(Phdr) *phdr, mode = getenv ("LD_TRACE_LOADED_OBJECTS") != NULL ? trace : normal; + /* Set up a flag which tells we are just starting. */ + _dl_starting_up = 1; + if (*user_entry == (ElfW(Addr)) &_start) { /* Ho ho. We are not the program interpreter! We are the program @@ -210,7 +213,7 @@ of this helper program; chances are you did not intend to run this program.\n", { void doit (void) { - l = _dl_map_object (NULL, _dl_argv[0], lt_library); + l = _dl_map_object (NULL, _dl_argv[0], lt_library, 0); } char *err_str = NULL; const char *obj_name __attribute__ ((unused)); @@ -223,7 +226,7 @@ of this helper program; chances are you did not intend to run this program.\n", } } else - l = _dl_map_object (NULL, _dl_argv[0], lt_library); + l = _dl_map_object (NULL, _dl_argv[0], lt_library, 0); phdr = l->l_phdr; phent = l->l_phnum; @@ -322,7 +325,7 @@ of this helper program; chances are you did not intend to run this program.\n", char *p; while ((p = strsep (&list, ":")) != NULL) { - (void) _dl_map_object (NULL, p, lt_library); + (void) _dl_map_object (NULL, p, lt_library, 0); ++npreloads; } } @@ -378,7 +381,7 @@ of this helper program; chances are you did not intend to run this program.\n", runp = file; while ((p = strsep (&runp, ": \t\n")) != NULL) { - (void) _dl_map_object (NULL, p, lt_library); + (void) _dl_map_object (NULL, p, lt_library, 0); ++npreloads; } } @@ -386,7 +389,7 @@ of this helper program; chances are you did not intend to run this program.\n", if (problem != NULL) { char *p = strndupa (problem, file_size - (problem - file)); - (void) _dl_map_object (NULL, p, lt_library); + (void) _dl_map_object (NULL, p, lt_library, 0); } /* We don't need the file anymore. */ @@ -412,7 +415,7 @@ of this helper program; chances are you did not intend to run this program.\n", /* Load all the libraries specified by DT_NEEDED entries. If LD_PRELOAD specified some libraries to load, these are inserted before the actual dependencies in the executable's searchlist for symbol resolution. */ - _dl_map_object_deps (l, preloads, npreloads); + _dl_map_object_deps (l, preloads, npreloads, mode == trace); #ifndef MAP_ANON /* We are done mapping things, so close the zero-fill descriptor. */ @@ -459,15 +462,20 @@ of this helper program; chances are you did not intend to run this program.\n", _dl_sysdep_message ("\t", "statically linked\n", NULL); else for (l = _dl_loaded->l_next; l; l = l->l_next) - { - char buf[20], *bp; - buf[sizeof buf - 1] = '\0'; - bp = _itoa (l->l_addr, &buf[sizeof buf - 1], 16, 0); - while ((size_t) (&buf[sizeof buf - 1] - bp) < sizeof l->l_addr * 2) - *--bp = '0'; - _dl_sysdep_message ("\t", l->l_libname, " => ", l->l_name, - " (0x", bp, ")\n", NULL); - } + if (l->l_opencount == 0) + /* The library was not found. */ + _dl_sysdep_message ("\t", l->l_libname, " => not found\n", NULL); + else + { + char buf[20], *bp; + buf[sizeof buf - 1] = '\0'; + bp = _itoa (l->l_addr, &buf[sizeof buf - 1], 16, 0); + while ((size_t) (&buf[sizeof buf - 1] - bp) + < sizeof l->l_addr * 2) + *--bp = '0'; + _dl_sysdep_message ("\t", l->l_libname, " => ", l->l_name, + " (0x", bp, ")\n", NULL); + } if (mode != trace) for (i = 1; i < _dl_argc; ++i) @@ -563,9 +571,6 @@ of this helper program; chances are you did not intend to run this program.\n", _dl_debug_state (); } - /* We finished the intialization and will start up. */ - _dl_starting_up = 1; - /* Once we return, _dl_sysdep_start will invoke the DT_INIT functions and then *USER_ENTRY. */ } |