diff --git a/glibc-fedora.patch b/glibc-fedora.patch index ab54c25..90438f1 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,21 @@ --- glibc-2.12.1-7-gfc0ed7b/ChangeLog +++ glibc-2.12.1-3/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-10-06 Ulrich Drepper * string/bug-strstr1.c: New file. -@@ -44,6 +50,10 @@ +@@ -44,6 +65,10 @@ * version.h (VERSION): Bump for 2.12.1 release. @@ -346,6 +361,17 @@ $(objpfx)tst-tls13: $(libdl) $(objpfx)tst-tls13.out: $(objpfx)tst-tlsmod13a.so +--- glibc-2.12.1-7-gfc0ed7b/elf/dl-deps.c ++++ glibc-2.12.1-3/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.12.1-7-gfc0ed7b/elf/dl-load.c +++ glibc-2.12.1-3/elf/dl-load.c @@ -169,8 +169,7 @@ local_strdup (const char *s) @@ -416,6 +442,96 @@ repl = DL_DST_LIB; if (repl != NULL && repl != (const char *) -1) +@@ -1815,7 +1811,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) +@@ -1897,7 +1893,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 +@@ -1966,7 +1962,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; +@@ -2070,7 +2066,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) +@@ -2085,14 +2082,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); +@@ -2101,12 +2099,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, +@@ -2172,7 +2170,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.12.1-7-gfc0ed7b/elf/dl-open.c ++++ glibc-2.12.1-3/elf/dl-open.c +@@ -252,7 +252,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.12.1-7-gfc0ed7b/elf/ldconfig.c +++ glibc-2.12.1-3/elf/ldconfig.c @@ -1031,17 +1031,19 @@ search_dirs (void) @@ -499,6 +615,65 @@ } const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; +--- glibc-2.12.1-7-gfc0ed7b/elf/rtld.c ++++ glibc-2.12.1-3/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); + --- glibc-2.12.1-7-gfc0ed7b/elf/tst-stackguard1.c +++ glibc-2.12.1-3/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) @@ -533,6 +708,16 @@ +++ glibc-2.12.1-3/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include +--- glibc-2.12.1-7-gfc0ed7b/include/dlfcn.h ++++ glibc-2.12.1-3/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.12.1-7-gfc0ed7b/include/features.h +++ glibc-2.12.1-3/include/features.h @@ -308,8 +308,13 @@ @@ -1406,6 +1591,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.12.1-7-gfc0ed7b/sysdeps/generic/ldsodefs.h ++++ glibc-2.12.1-3/sysdeps/generic/ldsodefs.h +@@ -824,11 +824,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.12.1-7-gfc0ed7b/sysdeps/i386/Makefile +++ glibc-2.12.1-3/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ diff --git a/glibc.spec b/glibc.spec index 7e119fa..01338de 100644 --- a/glibc.spec +++ b/glibc.spec @@ -23,7 +23,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 3 +Release: 4 # 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 @@ -1031,6 +1031,9 @@ rm -f *.filelist* %endif %changelog +* Fri Oct 22 2010 Andreas Schwab - 2.12.1-4 +- Require suid bit on audit objects in privileged programs (CVE-2010-3856) + * Tue Oct 19 2010 Andreas Schwab - 2.12.1-3 - Update from 2.12 branch - Fix strstr and memmem algorithm (BZ#12092, #641124) diff --git a/sources b/sources index de19463..edacebe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -880faaddc5da2bd5c7a8a65f4523de93 glibc-2.12.1-7-gfc0ed7b-fedora.tar.bz2 +6adc738b68de953ee40106c35d47eb4a glibc-2.12.1-7-gfc0ed7b-fedora.tar.bz2 7bf150a7e0f5e4a70acfea24a88f7103 glibc-2.12.1-7-gfc0ed7b.tar.bz2