From bca1dced0631ae719763a127f613272a22aededa Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 22 Oct 2010 19:12:36 +0200 Subject: [PATCH] 2.11.2-3 --- glibc-fedora.patch | 213 +++++++++++++++++++++++++++++++++++++++++++-- glibc.spec | 5 +- sources | 2 +- 3 files changed, 212 insertions(+), 8 deletions(-) diff --git a/glibc-fedora.patch b/glibc-fedora.patch index d76da69..ee0f39d 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,21 @@ --- glibc-2.11.2-5-g2158096/ChangeLog +++ glibc-2.11.2-2/ChangeLog -@@ -1,3 +1,9 @@ +@@ -1,3 +1,24 @@ ++2010-10-22 Andreas Schwab ++ ++ * include/dlfcn.h (__RTLD_SECURE): Define. ++ * elf/dl-load.c (_dl_map_object): Remove preloaded parameter. Use ++ mode & __RTLD_SECURE instead. ++ (open_path): Remove preloaded parameter to secure. ++ * sysdeps/generic/ldsodefs.h (_dl_map_object): Adjust declaration. ++ * elf/dl-open.c (dl_open_worker): Adjust call to _dl_map_object. ++ * elf/dl-deps.c (openaux): Likewise. ++ * elf/rtld.c (struct map_args): Remove is_preloaded. ++ (map_doit): Don't use it. ++ (dl_main): Likewise. ++ (do_preload): Use __RTLD_SECURE instead of is_preloaded. ++ (dlmopen_doit): Add __RTLD_SECURE to mode bits. ++ +2010-10-18 Andreas Schwab + + * elf/dl-load.c (is_dst): Remove last parameter. @@ -10,7 +25,7 @@ 2010-05-26 H.J. Lu [BZ #11640] -@@ -303,6 +309,19 @@ +@@ -303,6 +324,19 @@ redundant and incorrect else block which overwrites current line with the partial next line. @@ -30,7 +45,7 @@ 2010-01-14 Ulrich Drepper [BZ #11127] -@@ -1474,6 +1493,11 @@ d2009-10-30 Ulrich Drepper +@@ -1474,6 +1508,11 @@ d2009-10-30 Ulrich Drepper * sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in the unique symbol hash table should not be const. @@ -42,7 +57,7 @@ 2009-07-21 Ulrich Drepper * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove -@@ -1739,6 +1763,11 @@ d2009-10-30 Ulrich Drepper +@@ -1739,6 +1778,11 @@ d2009-10-30 Ulrich Drepper out common code into new function get_common_indeces. Determine extended family and model for Intel processors. @@ -54,7 +69,7 @@ 2009-06-26 Ulrich Drepper * resolv/resolv.h: Define RES_SNGLKUPREOP. -@@ -10432,6 +10461,10 @@ d2009-10-30 Ulrich Drepper +@@ -10432,6 +10476,10 @@ d2009-10-30 Ulrich Drepper [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -65,7 +80,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -11689,6 +11722,15 @@ d2009-10-30 Ulrich Drepper +@@ -11689,6 +11737,15 @@ d2009-10-30 Ulrich Drepper separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -289,6 +304,17 @@ # define O 0 # else # define O 1 +--- glibc-2.11.2-5-g2158096/elf/dl-deps.c ++++ glibc-2.11.2-2/elf/dl-deps.c +@@ -62,7 +62,7 @@ openaux (void *a) + { + 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, --- glibc-2.11.2-5-g2158096/elf/dl-load.c +++ glibc-2.11.2-2/elf/dl-load.c @@ -169,8 +169,7 @@ local_strdup (const char *s) @@ -359,6 +385,96 @@ repl = DL_DST_LIB; if (repl != NULL && repl != (const char *) -1) +@@ -1802,7 +1798,7 @@ open_verify (const char *name, struct filebuf *fbp, struct link_map *loader, + 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) +@@ -1884,7 +1880,7 @@ open_path (const char *name, size_t namelen, int preloaded, + /* 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 +@@ -1953,7 +1949,7 @@ open_path (const char *name, size_t namelen, int preloaded, + + 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; +@@ -2057,7 +2053,8 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, + 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) +@@ -2072,14 +2069,15 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, + && 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); +@@ -2088,12 +2086,12 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, + 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, +@@ -2159,7 +2157,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, + && ((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. */ +--- glibc-2.11.2-5-g2158096/elf/dl-open.c ++++ glibc-2.11.2-2/elf/dl-open.c +@@ -251,7 +251,7 @@ dl_open_worker (void *a) + + /* 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 --- glibc-2.11.2-5-g2158096/elf/ldconfig.c +++ glibc-2.11.2-2/elf/ldconfig.c @@ -1031,17 +1031,19 @@ search_dirs (void) @@ -442,6 +558,65 @@ } const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; +--- glibc-2.11.2-5-g2158096/elf/rtld.c ++++ glibc-2.11.2-2/elf/rtld.c +@@ -588,7 +588,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; +@@ -626,16 +625,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); + } +@@ -805,8 +805,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; + +@@ -1052,7 +1051,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); +@@ -1064,7 +1062,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); + --- glibc-2.11.2-5-g2158096/elf/tst-stackguard1.c +++ glibc-2.11.2-2/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) @@ -476,6 +651,16 @@ +++ glibc-2.11.2-2/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include +--- glibc-2.11.2-5-g2158096/include/dlfcn.h ++++ glibc-2.11.2-2/include/dlfcn.h +@@ -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 + --- glibc-2.11.2-5-g2158096/include/features.h +++ glibc-2.11.2-2/include/features.h @@ -299,8 +299,13 @@ @@ -1294,6 +1479,22 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another +--- glibc-2.11.2-5-g2158096/sysdeps/generic/ldsodefs.h ++++ glibc-2.11.2-2/sysdeps/generic/ldsodefs.h +@@ -820,11 +820,9 @@ extern void _dl_receive_error (receiver_fct fct, void (*operate) (void *), + + /* 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; --- glibc-2.11.2-5-g2158096/sysdeps/i386/Makefile +++ glibc-2.11.2-2/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ diff --git a/glibc.spec b/glibc.spec index 4ee3f6c..1af9267 100644 --- a/glibc.spec +++ b/glibc.spec @@ -28,7 +28,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 2 +Release: 3 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -1037,6 +1037,9 @@ rm -f *.filelist* %endif %changelog +* Fri Oct 22 2010 Andreas Schwab - 2.11.2-3 +- Require suid bit on audit objects in privileged programs (CVE-2010-3856) + * Thu Oct 21 2010 Andreas Schwab - 2.11.2-2 - Update from 2.11 branch - Correct x86 CPU family and model check (BZ#11640, #596554) diff --git a/sources b/sources index 25e55c2..ecbbf4e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -ed1527a897525947adebd5efd4eed25a glibc-2.11.2-5-g2158096-fedora.tar.bz2 +2f3e435647d450bc2608577ad42361f9 glibc-2.11.2-5-g2158096-fedora.tar.bz2 f4bbd2867792513caa2645787b5f9b2a glibc-2.11.2-5-g2158096.tar.bz2