[kernel] r13187 - in dists/lenny/linux-2.6/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Fri Mar 20 19:31:43 2009
New Revision: 13187

Log:
* Add -fwrapv to CFLAGS to prevent gcc from optimizing out certain
  wrap tests. (Closes: #520548)

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/add-fwrapv-to-cflags.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/14

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	(original)
+++ dists/lenny/linux-2.6/debian/changelog	Fri Mar 20 19:31:43 2009
@@ -28,6 +28,8 @@
   * Fixes for CVE-2009-0029 broke uml compilation; fix.
   * [openvz] simfs: fix oops if filesystem passes NULL mnt arg to
     getattr. (Closes: #508773)
+  * Add -fwrapv to CFLAGS to prevent gcc from optimizing out certain
+    wrap tests. (Closes: #520548)
 
   [ Martin Michlmayr ]
   * rt2x00: Fix VGC lower bound initialization. (Closes: #510607)
@@ -66,7 +68,7 @@
     context only
   * [openvz] 4909102 netfilter: call nf_register_hooks from VE0 context only.
 
- -- dann frazier <dannf at debian.org>  Fri, 20 Mar 2009 13:02:09 -0600
+ -- dann frazier <dannf at debian.org>  Fri, 20 Mar 2009 13:12:12 -0600
 
 linux-2.6 (2.6.26-13lenny2) stable-security; urgency=high
 

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/add-fwrapv-to-cflags.patch
==============================================================================
--- (empty file)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/add-fwrapv-to-cflags.patch	Fri Mar 20 19:31:43 2009
@@ -0,0 +1,37 @@
+commit 68df3755e383e6fecf2354a67b08f92f18536594
+Author: Linus Torvalds <torvalds at linux-foundation.org>
+Date:   Thu Mar 19 11:10:17 2009 -0700
+
+    Add '-fwrapv' to gcc CFLAGS
+    
+    This makes sure that gcc doesn't try to optimize away wrapping
+    arithmetic, which the kernel occasionally uses for overflow testing, ie
+    things like
+    
+    	if (ptr + offset < ptr)
+    
+    which technically is undefined for non-unsigned types. See
+    
+    	http://bugzilla.kernel.org/show_bug.cgi?id=12597
+    
+    for details.
+    
+    Not all versions of gcc support it, so we need to make it conditional
+    (it looks like it was introduced in gcc-3.4).
+    
+    Reminded-by: Alan Cox <alan at lxorguk.ukuu.org.uk>
+    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+
+Adjusted to apply to Debian's 2.6.26 by dann frazier <dannf at debian.org>
+
+diff -urpN linux-source-2.6.26.orig/Makefile linux-source-2.6.26/Makefile
+--- linux-source-2.6.26.orig/Makefile	2009-03-09 16:22:35.000000000 -0600
++++ linux-source-2.6.26/Makefile	2009-03-20 11:14:43.000000000 -0600
+@@ -321,6 +321,7 @@ KBUILD_CPPFLAGS := -D__KERNEL__ $(LINUXI
+ KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
+ 		   -fno-strict-aliasing -fno-common \
+ 		   -Werror-implicit-function-declaration
++KBUILD_CFLAGS	+= $(call cc-option,-fwrapv)
+ KBUILD_AFLAGS   := -D__ASSEMBLY__
+ 
+ # Read KERNELRELEASE from include/config/kernel.release (if it exists)

Modified: dists/lenny/linux-2.6/debian/patches/series/14
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/14	(original)
+++ dists/lenny/linux-2.6/debian/patches/series/14	Fri Mar 20 19:31:43 2009
@@ -23,3 +23,4 @@
 + bugfix/mips/inexistent-syscalls.patch
 + bugfix/x86/arch-ia32-entry-int80-enosys.patch
 + bugfix/all/CVE-2009-0029/fix-uml-compile.patch
++ bugfix/all/add-fwrapv-to-cflags.patch