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

[Dann Frazier]

Author: dannf
Date: Mon Jun 13 16:33:57 2011
New Revision: 17648

Log:
I needed to pull in a couple extra commits to get this fix to apply to lenny,
but just one of them was needed for squeeze. I grabbed the wrong one...

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/netns-xfrm-fixup-xfrm6_tunnel-error-propagation.patch
      - copied unchanged from r17646, dists/lenny-security/linux-2.6/debian/patches/bugfix/all/netns-xfrm-fixup-xfrm6_tunnel-error-propagation.patch
Deleted:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/xfrm6_tunnel-join-error-paths-using-goto.patch
Modified:
   dists/squeeze/linux-2.6/debian/patches/series/35

Copied: dists/squeeze/linux-2.6/debian/patches/bugfix/all/netns-xfrm-fixup-xfrm6_tunnel-error-propagation.patch (from r17646, dists/lenny-security/linux-2.6/debian/patches/bugfix/all/netns-xfrm-fixup-xfrm6_tunnel-error-propagation.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/netns-xfrm-fixup-xfrm6_tunnel-error-propagation.patch	Mon Jun 13 16:33:57 2011	(r17648, copy of r17646, dists/lenny-security/linux-2.6/debian/patches/bugfix/all/netns-xfrm-fixup-xfrm6_tunnel-error-propagation.patch)
@@ -0,0 +1,46 @@
+commit e924960dacdf85d118a98c7262edf2f99c3015cf
+Author: Alexey Dobriyan <adobriyan at gmail.com>
+Date:   Mon Jan 25 10:28:21 2010 +0000
+
+    netns xfrm: fixup xfrm6_tunnel error propagation
+    
+    Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c
+index 438831d..23fb100 100644
+--- a/net/ipv6/xfrm6_tunnel.c
++++ b/net/ipv6/xfrm6_tunnel.c
+@@ -353,13 +353,19 @@ static struct xfrm6_tunnel xfrm46_tunnel_handler = {
+ 
+ static int __init xfrm6_tunnel_init(void)
+ {
+-	if (xfrm_register_type(&xfrm6_tunnel_type, AF_INET6) < 0)
++	int rv;
++
++	rv = xfrm_register_type(&xfrm6_tunnel_type, AF_INET6);
++	if (rv < 0)
+ 		goto err;
+-	if (xfrm6_tunnel_register(&xfrm6_tunnel_handler, AF_INET6))
++	rv = xfrm6_tunnel_register(&xfrm6_tunnel_handler, AF_INET6);
++	if (rv < 0)
+ 		goto unreg;
+-	if (xfrm6_tunnel_register(&xfrm46_tunnel_handler, AF_INET))
++	rv = xfrm6_tunnel_register(&xfrm46_tunnel_handler, AF_INET);
++	if (rv < 0)
+ 		goto dereg6;
+-	if (xfrm6_tunnel_spi_init() < 0)
++	rv = xfrm6_tunnel_spi_init();
++	if (rv < 0)
+ 		goto dereg46;
+ 	return 0;
+ 
+@@ -370,7 +376,7 @@ dereg6:
+ unreg:
+ 	xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
+ err:
+-	return -EAGAIN;
++	return rv;
+ }
+ 
+ static void __exit xfrm6_tunnel_fini(void)

Modified: dists/squeeze/linux-2.6/debian/patches/series/35
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/35	Sat Jun 11 18:38:40 2011	(r17647)
+++ dists/squeeze/linux-2.6/debian/patches/series/35	Mon Jun 13 16:33:57 2011	(r17648)
@@ -264,6 +264,6 @@
 + bugfix/all/slub-Revert-PARISC-slub-fix-panic-with-DISCONTIGMEM.patch
 + bugfix/x86/x86-amd-do-not-enable-arat-feature-on-amd-processors-below.patch
 + bugfix/all/efi-corrupted-GUID-partition-tables-can-cause-kernel-oops.patch
-+ bugfix/all/xfrm6_tunnel-join-error-paths-using-goto.patch
++ bugfix/all/netns-xfrm-fixup-xfrm6_tunnel-error-propagation.patch
 + bugfix/all/tunnels-fix-netns-vs-proto-registration-ordering.patch
 + bugfix/all/fix-for-buffer-overflow-in-ldm_frag_add-not-sufficient.patch