Submitted By: Drew Ames (jxa127@verizon.net) Date: 2010-11-07 Initial Package Version: 2.12.1 Upstream Status: From upstream Origin: http://sourceware.org/ml/libc-hacker/2010-10/msg00010.html Description: Fixes a security vulnerability and makes LD_AUDIT behave same as LD_PRELOAD Submitted by Andreas Schwab at libc-hacker at sourceware dot org on Fri, 22 Oct 2010 19:17:20 +0200 [PATCH] Require suid bit on audit objects in privileged programs diff -Naur glibc-2.12.1.orig/elf/dl-deps.c glibc-2.12.1/elf/dl-deps.c --- glibc-2.12.1.orig/elf/dl-deps.c 2010-07-27 07:34:39.000000000 -0400 +++ glibc-2.12.1/elf/dl-deps.c 2010-11-07 12:33:08.160154499 -0500 @@ -62,7 +62,7 @@ { struct openaux_args *args = (struct openaux_args *) a; - args->aux = _dl_map_object (args->map, args->name, 0, + args->aux = _dl_map_object (args->map, args->name, (args->map->l_type == lt_executable ? lt_library : args->map->l_type), args->trace_mode, args->open_mode, diff -Naur glibc-2.12.1.orig/elf/dl-load.c glibc-2.12.1/elf/dl-load.c --- glibc-2.12.1.orig/elf/dl-load.c 2010-07-27 07:34:39.000000000 -0400 +++ glibc-2.12.1/elf/dl-load.c 2010-11-07 12:33:08.161154964 -0500 @@ -1815,7 +1815,7 @@ if MAY_FREE_DIRS is true. */ static int -open_path (const char *name, size_t namelen, int preloaded, +open_path (const char *name, size_t namelen, int secure, struct r_search_path_struct *sps, char **realname, struct filebuf *fbp, struct link_map *loader, int whatcode, bool *found_other_class) @@ -1897,7 +1897,7 @@ /* Remember whether we found any existing directory. */ here_any |= this_dir->status[cnt] != nonexisting; - if (fd != -1 && __builtin_expect (preloaded, 0) + if (fd != -1 && __builtin_expect (secure, 0) && INTUSE(__libc_enable_secure)) { /* This is an extra security effort to make sure nobody can @@ -1966,7 +1966,7 @@ struct link_map * internal_function -_dl_map_object (struct link_map *loader, const char *name, int preloaded, +_dl_map_object (struct link_map *loader, const char *name, int type, int trace_mode, int mode, Lmid_t nsid) { int fd; @@ -2070,7 +2070,8 @@ for (l = loader; l; l = l->l_loader) if (cache_rpath (l, &l->l_rpath_dirs, DT_RPATH, "RPATH")) { - fd = open_path (name, namelen, preloaded, &l->l_rpath_dirs, + fd = open_path (name, namelen, mode & __RTLD_SECURE, + &l->l_rpath_dirs, &realname, &fb, loader, LA_SER_RUNPATH, &found_other_class); if (fd != -1) @@ -2085,14 +2086,15 @@ && main_map != NULL && main_map->l_type != lt_loaded && cache_rpath (main_map, &main_map->l_rpath_dirs, DT_RPATH, "RPATH")) - fd = open_path (name, namelen, preloaded, &main_map->l_rpath_dirs, + fd = open_path (name, namelen, mode & __RTLD_SECURE, + &main_map->l_rpath_dirs, &realname, &fb, loader ?: main_map, LA_SER_RUNPATH, &found_other_class); } /* Try the LD_LIBRARY_PATH environment variable. */ if (fd == -1 && env_path_list.dirs != (void *) -1) - fd = open_path (name, namelen, preloaded, &env_path_list, + fd = open_path (name, namelen, mode & __RTLD_SECURE, &env_path_list, &realname, &fb, loader ?: GL(dl_ns)[LM_ID_BASE]._ns_loaded, LA_SER_LIBPATH, &found_other_class); @@ -2101,12 +2103,12 @@ if (fd == -1 && loader != NULL && cache_rpath (loader, &loader->l_runpath_dirs, DT_RUNPATH, "RUNPATH")) - fd = open_path (name, namelen, preloaded, + fd = open_path (name, namelen, mode & __RTLD_SECURE, &loader->l_runpath_dirs, &realname, &fb, loader, LA_SER_RUNPATH, &found_other_class); if (fd == -1 - && (__builtin_expect (! preloaded, 1) + && (__builtin_expect (! (mode & __RTLD_SECURE), 1) || ! INTUSE(__libc_enable_secure))) { /* Check the list of libraries in the file /etc/ld.so.cache, @@ -2172,7 +2174,7 @@ && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1)) && rtld_search_dirs.dirs != (void *) -1) - fd = open_path (name, namelen, preloaded, &rtld_search_dirs, + fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs, &realname, &fb, l, LA_SER_DEFAULT, &found_other_class); /* Add another newline when we are tracing the library loading. */ diff -Naur glibc-2.12.1.orig/elf/dl-open.c glibc-2.12.1/elf/dl-open.c --- glibc-2.12.1.orig/elf/dl-open.c 2010-07-27 07:34:39.000000000 -0400 +++ glibc-2.12.1/elf/dl-open.c 2010-11-07 12:33:08.161154964 -0500 @@ -252,7 +252,7 @@ /* Load the named object. */ struct link_map *new; - args->map = new = _dl_map_object (call_map, file, 0, lt_loaded, 0, + args->map = new = _dl_map_object (call_map, file, lt_loaded, 0, mode | __RTLD_CALLMAP, args->nsid); /* If the pointer returned is NULL this means the RTLD_NOLOAD flag is diff -Naur glibc-2.12.1.orig/elf/rtld.c glibc-2.12.1/elf/rtld.c --- glibc-2.12.1.orig/elf/rtld.c 2010-07-27 07:34:39.000000000 -0400 +++ glibc-2.12.1/elf/rtld.c 2010-11-07 12:33:08.162154121 -0500 @@ -589,7 +589,6 @@ /* 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 @@ 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 @@ 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 @@ 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 @@ 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); diff -Naur glibc-2.12.1.orig/include/dlfcn.h glibc-2.12.1/include/dlfcn.h --- glibc-2.12.1.orig/include/dlfcn.h 2010-07-27 07:34:39.000000000 -0400 +++ glibc-2.12.1/include/dlfcn.h 2010-11-07 12:33:08.163153897 -0500 @@ -9,6 +9,7 @@ #define __RTLD_OPENEXEC 0x20000000 #define __RTLD_CALLMAP 0x10000000 #define __RTLD_AUDIT 0x08000000 +#define __RTLD_SECURE 0x04000000 /* Apply additional security checks. */ #define __LM_ID_CALLER -2 diff -Naur glibc-2.12.1.orig/sysdeps/generic/ldsodefs.h glibc-2.12.1/sysdeps/generic/ldsodefs.h --- glibc-2.12.1.orig/sysdeps/generic/ldsodefs.h 2010-07-27 07:34:39.000000000 -0400 +++ glibc-2.12.1/sysdeps/generic/ldsodefs.h 2010-11-07 12:33:08.163153897 -0500 @@ -824,11 +824,9 @@ /* Open the shared object NAME and map in its segments. LOADER's DT_RPATH is used in searching for NAME. - If the object is already opened, returns its existing map. - For preloaded shared objects PRELOADED is set to a non-zero - value to allow additional security checks. */ + 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 preloaded, + const char *name, int type, int trace_mode, int mode, Lmid_t nsid) internal_function attribute_hidden;