[gentoo-commits] linux-patches r1446 - genpatches-2.6/trunk/2.6.27

[gentoo-commits] linux-patches r1446 - genpatches-2.6/trunk/2.6.27

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2008-12-18 19:13:42 +0000 (Thu, 18 Dec 2008)
New Revision: 1446

Removed:
   genpatches-2.6/trunk/2.6.27/2001_setkey-policy-breakage-fix.patch
Modified:
   genpatches-2.6/trunk/2.6.27/0000_README
Log:
Removed setkey-policy-breakage-fix.patch. Included in linux 2.6.27.10

Modified: genpatches-2.6/trunk/2.6.27/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.27/0000_README	2008-12-18 19:11:57 UTC (rev 1445)
+++ genpatches-2.6/trunk/2.6.27/0000_README	2008-12-18 19:13:42 UTC (rev 1446)
@@ -79,10 +79,6 @@
 From:	http://bugs.gentoo.org/229441
 Desc:	Fix shutdown hang on Sun Blade 100
 
-Patch:	2001_setkey-policy-breakage-fix.patch
-From:	http://bugs.gentoo.org/show_bug.cgi?id=245369
-Desc:	Patch to fix setkey policy breakage
-
 Patch:	2500_pentax-k10d-wrong-capacity.patch
 From:	http://bugs.gentoo.org/250406
 Desc:	Fix capacity reported by Pentax K10D camera

Deleted: genpatches-2.6/trunk/2.6.27/2001_setkey-policy-breakage-fix.patch
===================================================================
--- genpatches-2.6/trunk/2.6.27/2001_setkey-policy-breakage-fix.patch	2008-12-18 19:11:57 UTC (rev 1445)
+++ genpatches-2.6/trunk/2.6.27/2001_setkey-policy-breakage-fix.patch	2008-12-18 19:13:42 UTC (rev 1446)
@@ -1,45 +0,0 @@
-From: Alexey Dobriyan <adobriyan@gmail.com>
-Date: Fri, 31 Oct 2008 23:41:26 +0000 (-0700)
-Subject: key: fix setkey(8) policy set breakage
-X-Git-Tag: v2.6.28-rc3~3^2~4
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=920da6923cf03c8a78fbaffa408f8ab37f6abfc1
-
-key: fix setkey(8) policy set breakage
-
-Steps to reproduce:
-
-	#/usr/sbin/setkey -f
-	flush;
-	spdflush;
-
-	add 192.168.0.42 192.168.0.1 ah 24500 -A hmac-md5 "1234567890123456";
-	add 192.168.0.42 192.168.0.1 esp 24501 -E 3des-cbc "123456789012123456789012";
-
-	spdadd 192.168.0.42 192.168.0.1 any -P out ipsec
-		esp/transport//require
-		ah/transport//require;
-
-setkey: invalid keymsg length
-
-Policy dump will bail out with the same message after that.
-
--recv(4, "\2\16\0\0\32\0\3\0\0\0\0\0\37\r\0\0\3\0\5\0\377 \0\0\2\0\0\0\300\250\0*\0"..., 32768, 0) = 208
-+recv(4, "\2\16\0\0\36\0\3\0\0\0\0\0H\t\0\0\3\0\5\0\377 \0\0\2\0\0\0\300\250\0*\0"..., 32768, 0) = 208
-
-Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
-diff --git a/net/key/af_key.c b/net/key/af_key.c
-index e55e044..3440a46 100644
---- a/net/key/af_key.c
-+++ b/net/key/af_key.c
-@@ -2075,7 +2075,6 @@ static int pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, in
- 			req_size += socklen * 2;
- 		} else {
- 			size -= 2*socklen;
--			socklen = 0;
- 		}
- 		rq = (void*)skb_put(skb, req_size);
- 		pol->sadb_x_policy_len += req_size/8;
-