October 2010 - CRUX - lists.crux.nu

ports/core (2.6): [notify] glibc: security fix for CVE-2010-3847 and CVE-2010-3856
by crux＠crux.nu 26 Oct '10

26 Oct '10

commit f6826a058ad0548a4046f8193fc28aa2329b78b1 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Oct 26 14:57:52 2010 +0200 [notify] glibc: security fix for CVE-2010-3847 and CVE-2010-3856 Important security fix, a local attacker could exploit this to gain root privileges. See - http://seclists.org/fulldisclosure/2010/Oct/257 - http://seclists.org/fulldisclosure/2010/Oct/344 diff --git a/glibc/.md5sum b/glibc/.md5sum index abf400b..7422bc9 100644 --- a/glibc/.md5sum +++ b/glibc/.md5sum @@ -1,3 +1,5 @@ +733615b9c7f778639725ca40dbb781c6 CVE-2010-3847.patch +e64fc10ef089b48de254b5322b54cd42 CVE-2010-3856.patch ee71dedf724dc775e4efec9b823ed3be glibc-2.10.1.tar.bz2 8ef88560ec608d5923ee05eb5f0e15ea glibc-libidn-2.10.1.tar.bz2 96156bec8e05de67384dc93e72bdc313 host.conf diff --git a/glibc/CVE-2010-3847.patch b/glibc/CVE-2010-3847.patch new file mode 100644 index 0000000..3b2bd1c --- /dev/null +++ b/glibc/CVE-2010-3847.patch @@ -0,0 +1,98 @@ +# http://seclists.org/fulldisclosure/2010/Oct/257 +# http://sourceware.org/ml/libc-hacker/2010-10/msg00007.html + +Path elements containing $ORIGIN should always be ignored in privileged +programs. + +Andreas. + +2010-10-18 Andreas Schwab <schwab(a)redhat.com> + + * elf/dl-load.c (is_dst): Remove last parameter. + (_dl_dst_count): Ignore $ORIGIN in privileged programs. + (_dl_dst_substitute): Likewise. +--- + elf/dl-load.c | 30 +++++++++++++----------------- + 1 files changed, 13 insertions(+), 17 deletions(-) + +diff --git a/elf/dl-load.c b/elf/dl-load.c +index a7162eb..776f7e4 100644 +--- a/elf/dl-load.c ++++ b/elf/dl-load.c +@@ -169,8 +169,7 @@ local_strdup (const char *s) + + + static size_t +-is_dst (const char *start, const char *name, const char *str, +- int is_path, int secure) ++is_dst (const char *start, const char *name, const char *str, int is_path) + { + size_t len; + bool is_curly = false; +@@ -199,11 +198,6 @@ is_dst (const char *start, const char *name, const char *str, + && (!is_path || name[len] != ':')) + return 0; + +- if (__builtin_expect (secure, 0) +- && ((name[len] != '\0' && (!is_path || name[len] != ':')) +- || (name != start + 1 && (!is_path || name[-2] != ':')))) +- return 0; +- + return len; + } + +@@ -218,13 +212,12 @@ _dl_dst_count (const char *name, int is_path) + { + size_t len; + +- /* $ORIGIN is not expanded for SUID/GUID programs (except if it +- is $ORIGIN alone) and it must always appear first in path. */ ++ /* $ORIGIN is not expanded for SUID/GUID programs. */ + ++name; +- if ((len = is_dst (start, name, "ORIGIN", is_path, +- INTUSE(__libc_enable_secure))) != 0 +- || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0 +- || (len = is_dst (start, name, "LIB", is_path, 0)) != 0) ++ if (((len = is_dst (start, name, "ORIGIN", is_path)) != 0 ++ && !INTUSE(__libc_enable_secure)) ++ || (len = is_dst (start, name, "PLATFORM", is_path)) != 0 ++ || (len = is_dst (start, name, "LIB", is_path)) != 0) + ++cnt; + + name = strchr (name + len, '$'); +@@ -256,9 +249,12 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, + size_t len; + + ++name; +- if ((len = is_dst (start, name, "ORIGIN", is_path, +- INTUSE(__libc_enable_secure))) != 0) ++ if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0) + { ++ /* Ignore this path element in SUID/SGID programs. */ ++ if (INTUSE(__libc_enable_secure)) ++ repl = (const char *) -1; ++ else + #ifndef SHARED + if (l == NULL) + repl = _dl_get_origin (); +@@ -266,9 +262,9 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, + #endif + repl = l->l_origin; + } +- else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0) ++ else if ((len = is_dst (start, name, "PLATFORM", is_path)) != 0) + repl = GLRO(dl_platform); +- else if ((len = is_dst (start, name, "LIB", is_path, 0)) != 0) ++ else if ((len = is_dst (start, name, "LIB", is_path)) != 0) + repl = DL_DST_LIB; + + if (repl != NULL && repl != (const char *) -1) +-- +1.7.2.3 + + +-- +Andreas Schwab, schwab(a)redhat.com +GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E +"And now for something completely different." + diff --git a/glibc/CVE-2010-3856.patch b/glibc/CVE-2010-3856.patch new file mode 100644 index 0000000..0a621c9 --- /dev/null +++ b/glibc/CVE-2010-3856.patch @@ -0,0 +1,227 @@ +# http://seclists.org/fulldisclosure/2010/Oct/344 +# http://sourceware.org/ml/libc-hacker/2010-10/msg00010.html + +2010-10-22 Andreas Schwab <schwab(a)redhat.com> + + * include/dlfcn.h (__RTLD_SECURE): Define. + * elf/dl-load.c (_dl_map_object): Remove preloaded parameter. Use + mode & __RTLD_SECURE instead. + (open_path): Rename 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. +--- + elf/dl-deps.c | 2 +- + elf/dl-load.c | 20 +++++++++++--------- + elf/dl-open.c | 2 +- + elf/rtld.c | 16 +++++++--------- + include/dlfcn.h | 1 + + sysdeps/generic/ldsodefs.h | 6 ++---- + 6 files changed, 23 insertions(+), 24 deletions(-) + +diff --git a/elf/dl-deps.c b/elf/dl-deps.c +index e5b9cdf..1cab2d1 100644 +--- a/elf/dl-deps.c ++++ b/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, +diff --git a/elf/dl-load.c b/elf/dl-load.c +index 776f7e4..9ab3520 100644 +--- a/elf/dl-load.c ++++ b/elf/dl-load.c +@@ -1808,7 +1808,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) +@@ -1890,7 +1890,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 +@@ -1959,7 +1959,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; +@@ -2063,7 +2063,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) +@@ -2078,14 +2079,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); +@@ -2094,12 +2096,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, +@@ -2165,7 +2167,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. */ +diff --git a/elf/dl-open.c b/elf/dl-open.c +index c394b3f..cf8e8cc 100644 +--- a/elf/dl-open.c ++++ b/elf/dl-open.c +@@ -223,7 +223,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 +diff --git a/elf/rtld.c b/elf/rtld.c +index 201c9cf..4a8cee8 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -587,7 +587,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; +@@ -625,16 +624,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); + } +@@ -804,8 +804,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; + +@@ -1050,7 +1049,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); +@@ -1062,7 +1060,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); + +diff --git a/include/dlfcn.h b/include/dlfcn.h +index a67426d..af92483 100644 +--- a/include/dlfcn.h ++++ b/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 + +diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h +index fcc943b..fa4b6b2 100644 +--- a/sysdeps/generic/ldsodefs.h ++++ b/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; + diff --git a/glibc/Pkgfile b/glibc/Pkgfile index 9d1786b..15dd157 100644 --- a/glibc/Pkgfile +++ b/glibc/Pkgfile @@ -4,10 +4,11 @@ name=glibc version=2.10.1 -release=2 +release=3 source=(http://ftp.gnu.org/gnu/glibc/glibc-$version.tar.bz2 http://ftp.gnu.org/gnu/glibc/glibc-libidn-$version.tar.bz2 http://crux.nu/files/distfiles/kernel-headers-2.6.29-1.tar.bz2 + CVE-2010-3847.patch CVE-2010-3856.patch hosts resolv.conf nsswitch.conf host.conf ld.so.conf) build() { @@ -19,6 +20,9 @@ build() { # libidn files mv $name-libidn-$version $name-$version/libidn + patch -p1 -d $name-$version -i $SRC/CVE-2010-3847.patch + patch -p1 -d $name-$version -i $SRC/CVE-2010-3856.patch + mkdir build cd build ../$name-$version/configure --prefix=/usr \

1 0

ports/core (2.7): [notify] glibc: security fix for CVE-2010-3847 and CVE-2010-3856
by crux＠crux.nu 26 Oct '10

26 Oct '10

commit 73e65ee004d8a64d2f019cf27f39ff09a0ddc098 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Oct 26 13:24:47 2010 +0200 [notify] glibc: security fix for CVE-2010-3847 and CVE-2010-3856 Important security fix, a local attacker could exploit this to gain root privileges. See - http://seclists.org/fulldisclosure/2010/Oct/257 - http://seclists.org/fulldisclosure/2010/Oct/344 diff --git a/glibc/.md5sum b/glibc/.md5sum index e0d1f0c..f2a761c 100644 --- a/glibc/.md5sum +++ b/glibc/.md5sum @@ -1,3 +1,5 @@ +733615b9c7f778639725ca40dbb781c6 CVE-2010-3847.patch +e64fc10ef089b48de254b5322b54cd42 CVE-2010-3856.patch 6c8b3f5c56d80eba760cc896e7462b0e Optimize-__getpagesize-a-bit.patch 4802b783766b5b487c601a19b5ce35f1 glibc-2.12.1.tar.xz 6144e4b4074fc01deea1549de4920df1 glibc-fedora_i686.patch diff --git a/glibc/CVE-2010-3847.patch b/glibc/CVE-2010-3847.patch new file mode 100644 index 0000000..3b2bd1c --- /dev/null +++ b/glibc/CVE-2010-3847.patch @@ -0,0 +1,98 @@ +# http://seclists.org/fulldisclosure/2010/Oct/257 +# http://sourceware.org/ml/libc-hacker/2010-10/msg00007.html + +Path elements containing $ORIGIN should always be ignored in privileged +programs. + +Andreas. + +2010-10-18 Andreas Schwab <schwab(a)redhat.com> + + * elf/dl-load.c (is_dst): Remove last parameter. + (_dl_dst_count): Ignore $ORIGIN in privileged programs. + (_dl_dst_substitute): Likewise. +--- + elf/dl-load.c | 30 +++++++++++++----------------- + 1 files changed, 13 insertions(+), 17 deletions(-) + +diff --git a/elf/dl-load.c b/elf/dl-load.c +index a7162eb..776f7e4 100644 +--- a/elf/dl-load.c ++++ b/elf/dl-load.c +@@ -169,8 +169,7 @@ local_strdup (const char *s) + + + static size_t +-is_dst (const char *start, const char *name, const char *str, +- int is_path, int secure) ++is_dst (const char *start, const char *name, const char *str, int is_path) + { + size_t len; + bool is_curly = false; +@@ -199,11 +198,6 @@ is_dst (const char *start, const char *name, const char *str, + && (!is_path || name[len] != ':')) + return 0; + +- if (__builtin_expect (secure, 0) +- && ((name[len] != '\0' && (!is_path || name[len] != ':')) +- || (name != start + 1 && (!is_path || name[-2] != ':')))) +- return 0; +- + return len; + } + +@@ -218,13 +212,12 @@ _dl_dst_count (const char *name, int is_path) + { + size_t len; + +- /* $ORIGIN is not expanded for SUID/GUID programs (except if it +- is $ORIGIN alone) and it must always appear first in path. */ ++ /* $ORIGIN is not expanded for SUID/GUID programs. */ + ++name; +- if ((len = is_dst (start, name, "ORIGIN", is_path, +- INTUSE(__libc_enable_secure))) != 0 +- || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0 +- || (len = is_dst (start, name, "LIB", is_path, 0)) != 0) ++ if (((len = is_dst (start, name, "ORIGIN", is_path)) != 0 ++ && !INTUSE(__libc_enable_secure)) ++ || (len = is_dst (start, name, "PLATFORM", is_path)) != 0 ++ || (len = is_dst (start, name, "LIB", is_path)) != 0) + ++cnt; + + name = strchr (name + len, '$'); +@@ -256,9 +249,12 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, + size_t len; + + ++name; +- if ((len = is_dst (start, name, "ORIGIN", is_path, +- INTUSE(__libc_enable_secure))) != 0) ++ if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0) + { ++ /* Ignore this path element in SUID/SGID programs. */ ++ if (INTUSE(__libc_enable_secure)) ++ repl = (const char *) -1; ++ else + #ifndef SHARED + if (l == NULL) + repl = _dl_get_origin (); +@@ -266,9 +262,9 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, + #endif + repl = l->l_origin; + } +- else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0) ++ else if ((len = is_dst (start, name, "PLATFORM", is_path)) != 0) + repl = GLRO(dl_platform); +- else if ((len = is_dst (start, name, "LIB", is_path, 0)) != 0) ++ else if ((len = is_dst (start, name, "LIB", is_path)) != 0) + repl = DL_DST_LIB; + + if (repl != NULL && repl != (const char *) -1) +-- +1.7.2.3 + + +-- +Andreas Schwab, schwab(a)redhat.com +GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E +"And now for something completely different." + diff --git a/glibc/CVE-2010-3856.patch b/glibc/CVE-2010-3856.patch new file mode 100644 index 0000000..0a621c9 --- /dev/null +++ b/glibc/CVE-2010-3856.patch @@ -0,0 +1,227 @@ +# http://seclists.org/fulldisclosure/2010/Oct/344 +# http://sourceware.org/ml/libc-hacker/2010-10/msg00010.html + +2010-10-22 Andreas Schwab <schwab(a)redhat.com> + + * include/dlfcn.h (__RTLD_SECURE): Define. + * elf/dl-load.c (_dl_map_object): Remove preloaded parameter. Use + mode & __RTLD_SECURE instead. + (open_path): Rename 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. +--- + elf/dl-deps.c | 2 +- + elf/dl-load.c | 20 +++++++++++--------- + elf/dl-open.c | 2 +- + elf/rtld.c | 16 +++++++--------- + include/dlfcn.h | 1 + + sysdeps/generic/ldsodefs.h | 6 ++---- + 6 files changed, 23 insertions(+), 24 deletions(-) + +diff --git a/elf/dl-deps.c b/elf/dl-deps.c +index e5b9cdf..1cab2d1 100644 +--- a/elf/dl-deps.c ++++ b/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, +diff --git a/elf/dl-load.c b/elf/dl-load.c +index 776f7e4..9ab3520 100644 +--- a/elf/dl-load.c ++++ b/elf/dl-load.c +@@ -1808,7 +1808,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) +@@ -1890,7 +1890,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 +@@ -1959,7 +1959,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; +@@ -2063,7 +2063,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) +@@ -2078,14 +2079,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); +@@ -2094,12 +2096,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, +@@ -2165,7 +2167,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. */ +diff --git a/elf/dl-open.c b/elf/dl-open.c +index c394b3f..cf8e8cc 100644 +--- a/elf/dl-open.c ++++ b/elf/dl-open.c +@@ -223,7 +223,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 +diff --git a/elf/rtld.c b/elf/rtld.c +index 201c9cf..4a8cee8 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -587,7 +587,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; +@@ -625,16 +624,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); + } +@@ -804,8 +804,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; + +@@ -1050,7 +1049,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); +@@ -1062,7 +1060,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); + +diff --git a/include/dlfcn.h b/include/dlfcn.h +index a67426d..af92483 100644 +--- a/include/dlfcn.h ++++ b/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 + +diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h +index fcc943b..fa4b6b2 100644 +--- a/sysdeps/generic/ldsodefs.h ++++ b/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; + diff --git a/glibc/Pkgfile b/glibc/Pkgfile index 635e81a..e0931c3 100644 --- a/glibc/Pkgfile +++ b/glibc/Pkgfile @@ -4,11 +4,12 @@ name=glibc version=2.12.1 -release=1 +release=2 source=(http://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz http://crux.nu/files/distfiles/kernel-headers-2.6.35.tar.xz glibc-fedora_i686.patch Optimize-__getpagesize-a-bit.patch + CVE-2010-3847.patch CVE-2010-3856.patch hosts resolv.conf nsswitch.conf host.conf ld.so.conf) build() { @@ -19,6 +20,8 @@ build() { patch -p1 -d $name-$version -i $SRC/$name-fedora_i686.patch patch -R -p1 -d $name-$version -i $SRC/Optimize-__getpagesize-a-bit.patch + patch -p1 -d $name-$version -i $SRC/CVE-2010-3847.patch + patch -p1 -d $name-$version -i $SRC/CVE-2010-3856.patch sed -i '/^all-subdirs/,+6s/manual//' $name-$version/Makeconfig

1 0

Fwd: Re: pkg-get rsync support?
by Moritz Wilhelmy 25 Oct '10

25 Oct '10

Dear list, I asked Simone Rota if he'd be interested in implementing rsync support for pkg-get, with the following result, which sure looks good to me, but I didn't get around to test it yet. I thought someone else might be interested too, so here it is: Best regards, Moritz --- Begin forwarded message from Simone Rota --- From: Simone Rota To: Moritz Wilhelmy Date: Sat, 23 Oct 2010 14:48:30 +0200 Subject: Re: pkg-get rsync support? On 10/21/2010 09:16 PM, Moritz Wilhelmy wrote: >> I don't see a big advantage over http > I don't think there is one ;) Oh well :-) I attach a diff file that should make pkg-get support rsync repositories, valid urls are something like: pkgdir /my/packages/java|rsync://server.com::test1 pkgdir /my/packages/one|rsync://server.com::test2/one so server-side it's both ok to use separate rsync modules or dirs inside a module Warnings: - Mostly untested - The rsync output on package download is a bit verbose I no longer have access to the crux git repositories so if the patch works for you, you may ask some core maintainer to update the script (and maybe the docs/changelog) and prepare a new pkg-get release. Regards, Simone

2 1

new CRUX mirror from Polytechnic of Namibia
by acrux 22 Oct '10

22 Oct '10

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hi there, only to advise it's now available a new mirror kindly offered by the Polytechnic of Namibia. http://download.polytechnic.edu.na/pub3/CRUX/ ftp://download.polytechnic.edu.na/pub3/CRUX/ cheers, - --acrux - -- GNU/Linux on Power Architecture CRUX PPC - http://cruxppc.org/ -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) iEYEARECAAYFAkzBtXQACgkQxq34tDeO7LhbHACfRCi4xVNeny3qXQhH7V7bA9ky XeoAmgLfcrAdAJg897/W9wxwU30dCH4X =otjZ -----END PGP SIGNATURE-----

1 0

Polish Translation - Documentation.
by Piotr Bania 20 Oct '10

20 Oct '10

I would like to translate Crux's documentation from English to my native language - Polish.

2 1

ports/opt (2.7): [notify] firefox: updated to 3.6.11. This release resolves several vulnerabilities. See https://www.mozilla.org/security/known-vulnerabilities/firefox36.html for details.
by crux＠crux.nu 20 Oct '10

20 Oct '10

commit bdb809ed6d4a7c4ec48399aeaef173e962a8e636 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Wed Oct 20 18:59:55 2010 +0200 [notify] firefox: updated to 3.6.11. This release resolves several vulnerabilities. See https://www.mozilla.org/security/known-vulnerabilities/firefox36.html for details. diff --git a/firefox/.md5sum b/firefox/.md5sum index 34a3789..77b4263 100644 --- a/firefox/.md5sum +++ b/firefox/.md5sum @@ -1,2 +1,2 @@ -59ee60ddfd8b33e99a24788d3b12adb3 firefox-3.6.10.source.tar.bz2 -06e0b19237dea7d16e2aa0a816792d55 mozconfig +f698dd0f8f145d84933a50f69662c8db firefox-3.6.11.source.tar.bz2 +6cfb391f356f80bb6be9a418569efe6a mozconfig diff --git a/firefox/Pkgfile b/firefox/Pkgfile index 9929826..9fa9f2e 100644 --- a/firefox/Pkgfile +++ b/firefox/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xulrunner name=firefox -version=3.6.10 +version=3.6.11 release=1 source=(http://releases.mozilla.org/pub/mozilla.org/$name/releases/$version… mozconfig) diff --git a/firefox/mozconfig b/firefox/mozconfig index dcc8ced..ceb6767 100644 --- a/firefox/mozconfig +++ b/firefox/mozconfig @@ -16,7 +16,7 @@ ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-mng ac_add_options --with-pthreads -ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.2.10 +ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.2.11 ac_add_options --enable-system-cairo ac_add_options --enable-optimize="#CFLAGS#" ac_add_options --enable-official-branding

1 0

Re: Installing Crux on a Compaq 615 Laptop
by david＠norfair.se 20 Oct '10

20 Oct '10

>Which version of CRUX, David? 2.7 >While you are configuring your kernel, before you build it, you need to >enable the AHCI SATA module (either module, or built in - built in works >for sure) - you did not, so the kernel you compiled cannot find your >HDD, so it panics. I redid the installation-process for the 10th time now and made sure that the ACHI SATA module was built-in, still the same error. I am really baffled by this.. Best regards, David Lind

3 2

Installing Crux on a Compaq 615 Laptop
by david＠norfair.se 20 Oct '10

20 Oct '10

Hello! Recently I have been trying to install Crux on my laptop(Compaq 615) with poor results. Everything goes smooth during the partitioning, installation and making of the kernel, but when I reboot the system this pops up: Kernel panic - not syncing: VFS: Unable to mount root fs on unkown-block(8,1) Pid: 1, comm: swapper Not tainted 2.6.35.6 #1 Call Trace: [<c11f26cb>] ? panic+0x4a/0xaf [<c12f6ad7>] ? mount_block_root+0x1d5/0x1e9 [<c12f6be9>] ? mount_root+0x39/0x4d [<c12f6d3a>] ? prepare_namespace+0x13d/0x163 [<c12f6863>] ? kernel_init+0x195/0x1a0 [<c12f66ce>] ? kernel_init+0x0/0x1a0 [<c1002b56>] ? kernel_thread_helper+0x6/0x10 First I tried compiling my fs into the kernel instead of having it as a module, to no avail, still the same issue. So I scouted the net for several days and got a lead that the SATA controller could be the issue at hand. So I did the same there, marked the SATA options with (*).. but the problem continues. Has anyone got a clue on what could be causing this? This particular computer has run everything from Arch to Ubuntu so it would seem weird that there would be a deadend with using Crux. Here's my lspci: 1. 00:00.0 Host bridge: Advanced Micro Devices [AMD] RS780 Host Bridge 2. 00:01.0 PCI bridge: Advanced Micro Devices [AMD] RS780 PCI to PCI bridge (int gfx) 3. 00:04.0 PCI bridge: Advanced Micro Devices [AMD] RS780 PCI to PCI bridge (PCIE port 0) 4. 00:07.0 PCI bridge: Advanced Micro Devices [AMD] RS780 PCI to PCI bridge (PCIE port 3) 5. 00:09.0 PCI bridge: Advanced Micro Devices [AMD] RS780 PCI to PCI bridge (PCIE port 4) 6. 00:11.0 SATA controller: ATI Technologies Inc SB700/SB800 SATA Controller [AHCI mode] 7. 00:12.0 USB Controller: ATI Technologies Inc SB700/SB800 USB OHCI0 Controller 8. 00:12.1 USB Controller: ATI Technologies Inc SB700 USB OHCI1 Controller 9. 00:12.2 USB Controller: ATI Technologies Inc SB700/SB800 USB EHCI Controller 10. 00:13.0 USB Controller: ATI Technologies Inc SB700/SB800 USB OHCI0 Controller 11. 00:13.1 USB Controller: ATI Technologies Inc SB700 USB OHCI1 Controller 12. 00:13.2 USB Controller: ATI Technologies Inc SB700/SB800 USB EHCI Controller 13. 00:14.0 SMBus: ATI Technologies Inc SBx00 SMBus Controller (rev 3a) 14. 00:14.2 Audio device: ATI Technologies Inc SBx00 Azalia (Intel HDA) 15. 00:14.3 ISA bridge: ATI Technologies Inc SB700/SB800 LPC host controller 16. 00:14.4 PCI bridge: ATI Technologies Inc SBx00 PCI to PCI Bridge 17. 00:14.5 USB Controller: ATI Technologies Inc SB700/SB800 USB OHCI2 Controller 18. 00:18.0 Host bridge: Advanced Micro Devices [AMD] Family 11h HyperTransport Configuration (rev 40) 19. 00:18.1 Host bridge: Advanced Micro Devices [AMD] Family 11h Address Map 20. 00:18.2 Host bridge: Advanced Micro Devices [AMD] Family 11h DRAM Controller 21. 00:18.3 Host bridge: Advanced Micro Devices [AMD] Family 11h Miscellaneous Control 22. 00:18.4 Host bridge: Advanced Micro Devices [AMD] Family 11h Link Control 23. 01:05.0 VGA compatible controller: ATI Technologies Inc RS780M/RS780MN [Radeon HD 3200 Graphics] 24. 02:00.0 Ethernet controller: Marvell Technology Group Ltd. Device 4357 (rev 10) 25. 06:00.0 Network controller: Broadcom Corporation BCM4312 802.11b/g (rev 01) Any ideas? Best regards, David Lind

2 1

ports/opt (2.6): [notify] apache: update to 2.2.17
by crux＠crux.nu 20 Oct '10

20 Oct '10

commit a6355b8d81e56a9a851ffdfc4fc6b7d9fbec6178 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Oct 20 14:25:37 2010 +0200 [notify] apache: update to 2.2.17 Update with one security fix, see http://www.apache.org/dist/httpd/Announcement2.2.html (cherry picked from commit cff340c5b74c9c82ccb72c2c0e95ba3cae59480c) diff --git a/apache/.md5sum b/apache/.md5sum index 08c2789..0870584 100644 --- a/apache/.md5sum +++ b/apache/.md5sum @@ -1,4 +1,4 @@ e0514e5840c0e58cc4e7982a7e14fc4b apache 75a919be7ff65f443287b094eaf6a162 apache-ssl_cert.patch bd931fee9d102c361e95ad318d199674 crux.layout -c8ff2a07c884300bc7766a2e7f662d33 httpd-2.2.16.tar.bz2 +16eadc59ea6b38af33874d300973202e httpd-2.2.17.tar.bz2 diff --git a/apache/Pkgfile b/apache/Pkgfile index 1cfcb50..67f0e9a 100644 --- a/apache/Pkgfile +++ b/apache/Pkgfile @@ -5,7 +5,7 @@ # Group: apache name=apache -version=2.2.16 +version=2.2.17 release=1 source=(http://www.apache.org/dist/httpd/httpd-$version.tar.bz2 \ $name-ssl_cert.patch crux.layout apache)

1 0

ports/opt (2.7): [notify] apache: update to 2.2.17
by crux＠crux.nu 20 Oct '10

20 Oct '10

commit cff340c5b74c9c82ccb72c2c0e95ba3cae59480c Author: Juergen Daubert <jue(a)jue.li> Date: Wed Oct 20 14:25:37 2010 +0200 [notify] apache: update to 2.2.17 Update with one security fix, see http://www.apache.org/dist/httpd/Announcement2.2.html diff --git a/apache/.md5sum b/apache/.md5sum index 08c2789..0870584 100644 --- a/apache/.md5sum +++ b/apache/.md5sum @@ -1,4 +1,4 @@ e0514e5840c0e58cc4e7982a7e14fc4b apache 75a919be7ff65f443287b094eaf6a162 apache-ssl_cert.patch bd931fee9d102c361e95ad318d199674 crux.layout -c8ff2a07c884300bc7766a2e7f662d33 httpd-2.2.16.tar.bz2 +16eadc59ea6b38af33874d300973202e httpd-2.2.17.tar.bz2 diff --git a/apache/Pkgfile b/apache/Pkgfile index 1cfcb50..67f0e9a 100644 --- a/apache/Pkgfile +++ b/apache/Pkgfile @@ -5,7 +5,7 @@ # Group: apache name=apache -version=2.2.16 +version=2.2.17 release=1 source=(http://www.apache.org/dist/httpd/httpd-$version.tar.bz2 \ $name-ssl_cert.patch crux.layout apache)

1 0