[kernel] r10565 - in dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series

[Dann Frazier]

Author: dannf
Date: Sun Feb 17 23:20:40 2008
New Revision: 10565

Log:
build fix from upstream

Added:
   dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/267_ipv4-fib_props-out-of-bounds-2.diff
Modified:
   dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
   dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-10sarge6

Modified: dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
==============================================================================
--- dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	(original)
+++ dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	Sun Feb 17 23:20:40 2008
@@ -25,6 +25,7 @@
     See CVE-2007-1353
   * 246_dn_fib-out-of-bounds.diff
     266_ipv4-fib_props-out-of-bounds.diff
+    267_ipv4-fib_props-out-of-bounds-2.diff
     [SECURITY] Fix out of bounds condition in dn_fib_props[]
     See CVE-2007-2172
   * 247_reset-pdeathsig-on-suid.diff
@@ -88,7 +89,7 @@
     fails on the subarchitecture
     See CVE-2007-6694
 
- -- dann frazier <dannf at debian.org>  Thu, 14 Feb 2008 15:15:55 -0700
+ -- dann frazier <dannf at debian.org>  Sun, 17 Feb 2008 16:19:46 -0700
 
 kernel-source-2.4.27 (2.4.27-10sarge5) stable-security; urgency=high
 

Added: dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/267_ipv4-fib_props-out-of-bounds-2.diff
==============================================================================
--- (empty file)
+++ dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/267_ipv4-fib_props-out-of-bounds-2.diff	Sun Feb 17 23:20:40 2008
@@ -0,0 +1,25 @@
+commit 366592901204f1ca8422b591b7de1ffe0f78d51a
+Author: Urs Thermann <urs at isnogud.escape.de>
+Date:   Sun Apr 22 17:43:50 2007 +0200
+
+    [PATCH] recent patch to fib_semantics broke build
+    
+    Fix label name.
+
+diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
+index b930371..ef8f407 100644
+--- a/net/ipv4/fib_semantics.c
++++ b/net/ipv4/fib_semantics.c
+@@ -431,10 +431,8 @@ fib_create_info(const struct rtmsg *r, struct kern_rta *rta,
+ 	const int nhs = 1;
+ #endif
+ 
+-	if (r->rtm_type > RTN_MAX) {
+-		err = -EINVAL;
+-		goto errout;
+-	}
++	if (r->rtm_type > RTN_MAX)
++		goto err_inval;
+ 
+ 	/* Fast check to catch the most weird cases */
+ 	if (fib_props[r->rtm_type].scope > r->rtm_scope)

Modified: dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-10sarge6
==============================================================================
--- dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-10sarge6	(original)
+++ dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-10sarge6	Sun Feb 17 23:20:40 2008
@@ -26,3 +26,4 @@
 + 264_mmap-VM_DONTEXPAND.diff
 + 265_powerpc-chrp-null-deref.diff
 + 266_ipv4-fib_props-out-of-bounds.diff
++ 267_ipv4-fib_props-out-of-bounds-2.diff