[kernel] r17837 - in dists/squeeze-security/linux-2.6/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Thu Jul 21 07:01:55 2011
New Revision: 17837

Log:
Fix regression in fix for CVE-2011-1768 (Closes: #633738)

Added:
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/tunnels-fix-netns-vs-proto-registration-ordering-regression-fix.patch
   dists/squeeze-security/linux-2.6/debian/patches/series/35squeeze1
Modified:
   dists/squeeze-security/linux-2.6/debian/changelog

Modified: dists/squeeze-security/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/changelog	Tue Jul 19 09:26:37 2011	(r17836)
+++ dists/squeeze-security/linux-2.6/debian/changelog	Thu Jul 21 07:01:55 2011	(r17837)
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.32-35squeeze1) UNRELEASED; urgency=high
+
+  * Fix regression in fix for CVE-2011-1768 (Closes: #633738)
+
+ -- dann frazier <dannf at debian.org>  Thu, 21 Jul 2011 00:31:53 -0600
+
 linux-2.6 (2.6.32-35) stable; urgency=high
 
   [ Ben Hutchings ]

Added: dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/tunnels-fix-netns-vs-proto-registration-ordering-regression-fix.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/tunnels-fix-netns-vs-proto-registration-ordering-regression-fix.patch	Thu Jul 21 07:01:55 2011	(r17837)
@@ -0,0 +1,12 @@
+diff -urpN linux-source-2.6.32.orig/net/ipv6/ip6_tunnel.c linux-source-2.6.32/net/ipv6/ip6_tunnel.c
+--- linux-source-2.6.32.orig/net/ipv6/ip6_tunnel.c	2011-06-11 13:10:52.000000000 -0600
++++ linux-source-2.6.32/net/ipv6/ip6_tunnel.c	2011-07-21 00:23:41.002857909 -0600
+@@ -1465,7 +1465,7 @@ static int __init ip6_tunnel_init(void)
+ {
+ 	int  err;
+ 
+-	err = register_pernet_device(&ip6_tnl_net_ops);
++	err = register_pernet_gen_device(&ip6_tnl_net_id, &ip6_tnl_net_ops);
+ 	if (err < 0)
+ 		goto out_pernet;
+ 

Added: dists/squeeze-security/linux-2.6/debian/patches/series/35squeeze1
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-security/linux-2.6/debian/patches/series/35squeeze1	Thu Jul 21 07:01:55 2011	(r17837)
@@ -0,0 +1 @@
++ bugfix/all/tunnels-fix-netns-vs-proto-registration-ordering-regression-fix.patch