aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-02-17 02:35:52 +0000
committerUlrich Drepper <drepper@redhat.com>2004-02-17 02:35:52 +0000
commitf04b9a68febb179fc90095ae4f9fb2b7ec68a901 (patch)
tree8a73307fc78bb6a5649d99f83ad28c84027a21e1 /elf
parentcd9fdc72adf065702046aa63af8b569e023cdf88 (diff)
downloadglibc-f04b9a68febb179fc90095ae4f9fb2b7ec68a901.tar
glibc-f04b9a68febb179fc90095ae4f9fb2b7ec68a901.tar.gz
glibc-f04b9a68febb179fc90095ae4f9fb2b7ec68a901.tar.bz2
glibc-f04b9a68febb179fc90095ae4f9fb2b7ec68a901.zip
Update.
* elf/rtld.c (dl_main): Don't fail execution if file named in ld.so.preload is not present.
Diffstat (limited to 'elf')
-rw-r--r--elf/rtld.c41
1 files changed, 32 insertions, 9 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index e0f9f28944..f988dd4519 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -514,8 +514,11 @@ struct map_args
{
/* Argument to map_doit. */
char *str;
+ struct link_map *loader;
+ int is_preloaded;
+ int mode;
/* Return value of map_doit. */
- struct link_map *main_map;
+ struct link_map *map;
};
/* Arguments to version_check_doit. */
@@ -537,8 +540,9 @@ static void
map_doit (void *a)
{
struct map_args *args = (struct map_args *) a;
- args->main_map = INTUSE(_dl_map_object) (NULL, args->str, 0, lt_library, 0,
- __RTLD_OPENEXEC);
+ args->map = INTUSE(_dl_map_object) (args->loader, args->str,
+ args->is_preloaded, lt_library, 0,
+ args->mode);
}
static void
@@ -798,6 +802,9 @@ of this helper program; chances are you did not intend to run this program.\n\
struct map_args args;
args.str = rtld_progname;
+ args.loader = NULL;
+ args.is_preloaded = 0;
+ args.mode = __RTLD_OPENEXEC;
(void) INTUSE(_dl_catch_error) (&objname, &err_str, map_doit, &args);
if (__builtin_expect (err_str != NULL, 0))
/* We don't free the returned string, the programs stops
@@ -1084,7 +1091,8 @@ of this helper program; chances are you did not intend to run this program.\n\
}
/* Read the contents of the file. */
- file = _dl_sysdep_read_whole_file ("/etc/ld.so.preload", &file_size,
+ const char preload_file[] = "/etc/ld.so.preload";
+ file = _dl_sysdep_read_whole_file (preload_file, &file_size,
PROT_READ | PROT_WRITE);
if (__builtin_expect (file != MAP_FAILED, 0))
{
@@ -1139,11 +1147,26 @@ of this helper program; chances are you did not intend to run this program.\n\
while ((p = strsep (&runp, ": \t\n")) != NULL)
if (p[0] != '\0')
{
- struct link_map *new_map = INTUSE(_dl_map_object) (GL(dl_loaded),
- p, 1,
- lt_library,
- 0, 0);
- if (++new_map->l_opencount == 1)
+ const char *objname;
+ const char *err_str = NULL;
+ struct map_args args;
+
+ args.str = p;
+ args.loader = GL(dl_loaded);
+ args.is_preloaded = 1;
+ args.mode = 0;
+
+ (void) INTUSE(_dl_catch_error) (&objname, &err_str, map_doit,
+ &args);
+ if (__builtin_expect (err_str != NULL, 0))
+ {
+ _dl_error_printf ("\
+ERROR: ld.so: object '%s' from %s cannot be preloaded: ignored.\n",
+ p, preload_file);
+ /* No need to call free, this is still before the libc's
+ malloc is used. */
+ }
+ else if (++args.map->l_opencount == 1)
/* It is no duplicate. */
++npreloads;
}