[kernel] r17649 - dists/squeeze/linux-2.6/debian/patches/features/all/openvz

[Dann Frazier]

Author: dannf
Date: Mon Jun 13 16:34:39 2011
New Revision: 17649

Log:
Port on top of fix for CVE-2011-1768

Modified:
   dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch

Modified: dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Mon Jun 13 16:33:57 2011	(r17648)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Mon Jun 13 16:34:39 2011	(r17649)
@@ -84330,13 +84330,12 @@
  	rtnl_lock();
  	ipip_destroy_tunnels(ipn);
  	unregister_netdevice(ipn->fb_tunnel_dev);
-@@ -838,12 +956,15 @@ static int __init ipip_init(void)
- 	err = register_pernet_gen_device(&ipip_net_id, &ipip_net_ops);
- 	if (err)
- 		xfrm4_tunnel_deregister(&ipip_handler, AF_INET);
+@@ -838,11 +956,14 @@ static int __init ipip_init(void)
+ 		unregister_pernet_device(&ipip_net_ops);
+ 		printk(KERN_INFO "ipip init: can't register tunnel\n");
+ 	}
 +	else
 +		register_netdev_rst(&ipip_netdev_rst);
- 
  	return err;
  }
  
@@ -87799,14 +87798,14 @@
  
  	unregister_pernet_gen_device(sit_net_id, &sit_net_ops);
 @@ -1094,6 +1213,8 @@ static int __init sit_init(void)
- 	err = register_pernet_gen_device(&sit_net_id, &sit_net_ops);
- 	if (err < 0)
- 		xfrm4_tunnel_deregister(&sit_handler, AF_INET6);
+ 		unregister_pernet_device(&sit_net_ops);
+ 		printk(KERN_INFO "sit init: Can't add protocol\n");
+ 	}
 +	else
 +		register_netdev_rst(&sit_netdev_rst);
- 
  	return err;
  }
+ 
 diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
 index 21d100b..1c534b7 100644
 --- a/net/ipv6/tcp_ipv6.c