diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-10-24 21:43:15 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-10-24 21:43:15 -0400 |
| commit | 8e9f92e9d5d7737afdacf79b76d98c4c42980508 (patch) | |
| tree | e32d3fc076f96d6b6ee06e2a43bc0ff9e408a2a5 /elf/rtld.c | |
| parent | bc96fbda275c305ddc1b0b6d94fc68d81369221a (diff) | |
| download | glibc-8e9f92e9d5d7737afdacf79b76d98c4c42980508.tar glibc-8e9f92e9d5d7737afdacf79b76d98c4c42980508.tar.gz glibc-8e9f92e9d5d7737afdacf79b76d98c4c42980508.tar.bz2 glibc-8e9f92e9d5d7737afdacf79b76d98c4c42980508.zip | |
Require suid bit on audit objects in privileged programs
Diffstat (limited to 'elf/rtld.c')
| -rw-r--r-- | elf/rtld.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/elf/rtld.c b/elf/rtld.c index 5ecc4fe711..06b534a559 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -589,7 +589,6 @@ 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 *map; @@ -627,16 +626,17 @@ static void map_doit (void *a) { struct map_args *args = (struct map_args *) a; - args->map = _dl_map_object (args->loader, args->str, - args->is_preloaded, lt_library, 0, args->mode, - LM_ID_BASE); + args->map = _dl_map_object (args->loader, args->str, lt_library, 0, + args->mode, LM_ID_BASE); } static void dlmopen_doit (void *a) { struct dlmopen_args *args = (struct dlmopen_args *) a; - args->map = _dl_open (args->fname, RTLD_LAZY | __RTLD_DLOPEN | __RTLD_AUDIT, + args->map = _dl_open (args->fname, + (RTLD_LAZY | __RTLD_DLOPEN | __RTLD_AUDIT + | __RTLD_SECURE), dl_main, LM_ID_NEWLM, _dl_argc, INTUSE(_dl_argv), __environ); } @@ -806,8 +806,7 @@ do_preload (char *fname, struct link_map *main_map, const char *where) args.str = fname; args.loader = main_map; - args.is_preloaded = 1; - args.mode = 0; + args.mode = __RTLD_SECURE; unsigned int old_nloaded = GL(dl_ns)[LM_ID_BASE]._ns_nloaded; @@ -1054,7 +1053,6 @@ of this helper program; chances are you did not intend to run this program.\n\ args.str = rtld_progname; args.loader = NULL; - args.is_preloaded = 0; args.mode = __RTLD_OPENEXEC; (void) _dl_catch_error (&objname, &err_str, &malloced, map_doit, &args); @@ -1066,7 +1064,7 @@ of this helper program; chances are you did not intend to run this program.\n\ else { HP_TIMING_NOW (start); - _dl_map_object (NULL, rtld_progname, 0, lt_library, 0, + _dl_map_object (NULL, rtld_progname, lt_library, 0, __RTLD_OPENEXEC, LM_ID_BASE); HP_TIMING_NOW (stop); |