Author: adconrad Date: 2013-11-20 13:59:42 +0000 (Wed, 20 Nov 2013) New Revision: 5771
Added: glibc-package/trunk/debian/patches/any/cvs-CVE-2013-4237-alignment.diff Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/series glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc glibc-package/trunk/debian/testsuite-checking/expected-results-i686-gnu-i386 glibc-package/trunk/debian/testsuite-checking/expected-results-i686-gnu-i686 glibc-package/trunk/debian/testsuite-checking/expected-results-i686-gnu-xen glibc-package/trunk/debian/testsuite-checking/expected-results-mips-linux-gnu-libc glibc-package/trunk/debian/testsuite-checking/expected-results-mips32-linux-gnu-mipsn32 glibc-package/trunk/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32 glibc-package/trunk/debian/testsuite-checking/expected-results-mips64-linux-gnu-mips64 glibc-package/trunk/debian/testsuite-checking/expected-results-mips64el-linux-gnu-mips64 glibc-package/trunk/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc Log: * patches/any/cvs-CVE-2013-4237-alignment.diff: Fix alignment of the directory block in dirstream.h, fixing readdir regression on sparc. * testsuite-checking/*: Allow ptrguard test to fail on mips and hurd. Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2013-11-10 16:42:06 UTC (rev 5770) +++ glibc-package/trunk/debian/changelog 2013-11-20 13:59:42 UTC (rev 5771) @@ -1,11 +1,11 @@ -eglibc (2.17-96) UNRELEASED; urgency=low +eglibc (2.17-96) unstable; urgency=low - !!! PLEASE MOVE FEATURE DEVELOPMENT TO 2.18 OR UPSTREAM !!! + * patches/any/cvs-CVE-2013-4237-alignment.diff: Fix alignment of the + directory block in dirstream.h, fixing readdir regression on sparc. + * testsuite-checking/*: Allow ptrguard test to fail on mips and hurd. - * + -- Adam Conrad <[email protected]> Fri, 15 Nov 2013 09:39:47 +0000 - -- Adam Conrad <[email protected]> Sun, 10 Nov 2013 09:41:24 -0700 - eglibc (2.17-95) unstable; urgency=low [ Adam Conrad ] Added: glibc-package/trunk/debian/patches/any/cvs-CVE-2013-4237-alignment.diff =================================================================== --- glibc-package/trunk/debian/patches/any/cvs-CVE-2013-4237-alignment.diff (rev 0) +++ glibc-package/trunk/debian/patches/any/cvs-CVE-2013-4237-alignment.diff 2013-11-20 13:59:42 UTC (rev 5771) @@ -0,0 +1,29 @@ +commit 75b4202ab03337edb37536e3d9470a48a04c9341 +Author: David S. Miller <[email protected]> +Date: Thu Oct 10 22:32:36 2013 -0700 + + Fix readdir regressions on sparc 32-bit. + + * sysdeps/posix/dirstream.h (struct __dirstream): Fix alignment of + directory block. + +diff --git a/sysdeps/posix/dirstream.h b/sysdeps/posix/dirstream.h +index 8e8570d..be20895 100644 +--- a/sysdeps/posix/dirstream.h ++++ b/sysdeps/posix/dirstream.h +@@ -41,8 +41,13 @@ struct __dirstream + + int errcode; /* Delayed error code. */ + +- /* Directory block. */ +- char data[0] __attribute__ ((aligned (__alignof__ (void*)))); ++ /* Directory block. We must make sure that this block starts ++ at an address that is aligned adequately enough to store ++ dirent entries. Using the alignment of "void *" is not ++ sufficient because dirents on 32-bit platforms can require ++ 64-bit alignment. We use "long double" here to be consistent ++ with what malloc uses. */ ++ char data[0] __attribute__ ((aligned (__alignof__ (long double)))); + }; + + #define _DIR_dirfd(dirp) ((dirp)->fd) Modified: glibc-package/trunk/debian/patches/series =================================================================== --- glibc-package/trunk/debian/patches/series 2013-11-10 16:42:06 UTC (rev 5770) +++ glibc-package/trunk/debian/patches/series 2013-11-20 13:59:42 UTC (rev 5771) @@ -263,6 +263,7 @@ any/cvs-CVE-2013-4332-valloc.diff any/cvs-CVE-2012-44xx.diff any/cvs-CVE-2013-4237.diff +any/cvs-CVE-2013-4237-alignment.diff #any/cvs-CVE-2013-2207-pt_chown.diff any/cvs-CVE-2013-4788-static-ptrguard.diff any/cvs-CVE-2013-4788-static-ptrguard-ppc64.diff Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc =================================================================== --- glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc 2013-11-10 16:42:06 UTC (rev 5770) +++ glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc 2013-11-20 13:59:42 UTC (rev 5771) @@ -12,6 +12,8 @@ tst-timer2.o, Error 1 tst-timer4.o, Error 1 tst-timer5.o, Error 1 +tst-ptrguard1-static.o, Error 1 +tst-ptrguard1.o, Error 1 # # Need investigation annexc.out, Error 1 (ignored) Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-i686-gnu-i386 =================================================================== --- glibc-package/trunk/debian/testsuite-checking/expected-results-i686-gnu-i386 2013-11-10 16:42:06 UTC (rev 5770) +++ glibc-package/trunk/debian/testsuite-checking/expected-results-i686-gnu-i386 2013-11-20 13:59:42 UTC (rev 5771) @@ -12,6 +12,8 @@ tst-timer2.o, Error 1 tst-timer4.o, Error 1 tst-timer5.o, Error 1 +tst-ptrguard1-static.o, Error 1 +tst-ptrguard1.o, Error 1 # # Need investigation annexc.out, Error 1 (ignored) Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-i686-gnu-i686 =================================================================== --- glibc-package/trunk/debian/testsuite-checking/expected-results-i686-gnu-i686 2013-11-10 16:42:06 UTC (rev 5770) +++ glibc-package/trunk/debian/testsuite-checking/expected-results-i686-gnu-i686 2013-11-20 13:59:42 UTC (rev 5771) @@ -12,6 +12,8 @@ tst-timer2.o, Error 1 tst-timer4.o, Error 1 tst-timer5.o, Error 1 +tst-ptrguard1-static.o, Error 1 +tst-ptrguard1.o, Error 1 # # Need investigation annexc.out, Error 1 (ignored) Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-i686-gnu-xen =================================================================== --- glibc-package/trunk/debian/testsuite-checking/expected-results-i686-gnu-xen 2013-11-10 16:42:06 UTC (rev 5770) +++ glibc-package/trunk/debian/testsuite-checking/expected-results-i686-gnu-xen 2013-11-20 13:59:42 UTC (rev 5771) @@ -12,6 +12,8 @@ tst-timer2.o, Error 1 tst-timer4.o, Error 1 tst-timer5.o, Error 1 +tst-ptrguard1-static.o, Error 1 +tst-ptrguard1.o, Error 1 # # Need investigation annexc.out, Error 1 (ignored) Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-mips-linux-gnu-libc =================================================================== --- glibc-package/trunk/debian/testsuite-checking/expected-results-mips-linux-gnu-libc 2013-11-10 16:42:06 UTC (rev 5770) +++ glibc-package/trunk/debian/testsuite-checking/expected-results-mips-linux-gnu-libc 2013-11-20 13:59:42 UTC (rev 5771) @@ -21,6 +21,8 @@ tst-tls3.out, Error 1 tst-waitid.out, Error 1 tst-cputimer1.out, Error 1 +tst-ptrguard1-static.out, Error 1 +tst-ptrguard1.out, Error 1 # These failures are caused by an inconsistency between userland and # kernel about prlimit64. They should be removed once the kernel or Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-mips32-linux-gnu-mipsn32 =================================================================== --- glibc-package/trunk/debian/testsuite-checking/expected-results-mips32-linux-gnu-mipsn32 2013-11-10 16:42:06 UTC (rev 5770) +++ glibc-package/trunk/debian/testsuite-checking/expected-results-mips32-linux-gnu-mipsn32 2013-11-20 13:59:42 UTC (rev 5771) @@ -26,6 +26,8 @@ tst-tls3.out, Error 1 tst-waitid.out, Error 1 tst-cputimer1.out, Error 1 +tst-ptrguard1-static.out, Error 1 +tst-ptrguard1.out, Error 1 # These failures are caused by an inconsistency between userland and # kernel about prlimit64. They should be removed once the kernel or Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32 =================================================================== --- glibc-package/trunk/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32 2013-11-10 16:42:06 UTC (rev 5770) +++ glibc-package/trunk/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32 2013-11-20 13:59:42 UTC (rev 5771) @@ -27,6 +27,8 @@ tst-tls3.out, Error 1 tst-waitid.out, Error 1 tst-cputimer1.out, Error 1 +tst-ptrguard1-static.out, Error 1 +tst-ptrguard1.out, Error 1 # These failures are caused by an inconsistency between userland and # kernel about prlimit64. They should be removed once the kernel or Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-mips64-linux-gnu-mips64 =================================================================== --- glibc-package/trunk/debian/testsuite-checking/expected-results-mips64-linux-gnu-mips64 2013-11-10 16:42:06 UTC (rev 5770) +++ glibc-package/trunk/debian/testsuite-checking/expected-results-mips64-linux-gnu-mips64 2013-11-20 13:59:42 UTC (rev 5771) @@ -26,6 +26,8 @@ tst-waitid.out, Error 1 tst-writev.out, Error 1 tst-cputimer1.out, Error 1 +tst-ptrguard1-static.out, Error 1 +tst-ptrguard1.out, Error 1 # These failures are caused by an inconsistency between userland and # kernel about prlimit64. They should be removed once the kernel or Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-mips64el-linux-gnu-mips64 =================================================================== --- glibc-package/trunk/debian/testsuite-checking/expected-results-mips64el-linux-gnu-mips64 2013-11-10 16:42:06 UTC (rev 5770) +++ glibc-package/trunk/debian/testsuite-checking/expected-results-mips64el-linux-gnu-mips64 2013-11-20 13:59:42 UTC (rev 5771) @@ -27,6 +27,8 @@ tst-waitid.out, Error 1 tst-writev.out, Error 1 tst-cputimer1.out, Error 1 +tst-ptrguard1-static.out, Error 1 +tst-ptrguard1.out, Error 1 # These failures are caused by an inconsistency between userland and # kernel about prlimit64. They should be removed once the kernel or Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc =================================================================== --- glibc-package/trunk/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc 2013-11-10 16:42:06 UTC (rev 5770) +++ glibc-package/trunk/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc 2013-11-20 13:59:42 UTC (rev 5771) @@ -22,6 +22,8 @@ tst-tls3.out, Error 1 tst-waitid.out, Error 1 tst-cputimer1.out, Error 1 +tst-ptrguard1-static.out, Error 1 +tst-ptrguard1.out, Error 1 # These failures are caused by an inconsistency between userland and # kernel about prlimit64. They should be removed once the kernel or -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
