rpms/kernel/F-8 linux-2.6-af_key-fix-selector-family-initialization.patch, NONE, 1.1 kernel.spec, 1.462, 1.463

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12899

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-af_key-fix-selector-family-initialization.patch 
Log Message:
* Mon Jun 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.6-23
- Fix init of af_key sockets (#450499)


linux-2.6-af_key-fix-selector-family-initialization.patch:

--- NEW FILE linux-2.6-af_key-fix-selector-family-initialization.patch ---
>From ead8aded50c2a631955fcf0fb6c477c02f7b9e46 Mon Sep 17 00:00:00 2001
Message-Id: <20080609.134337.193698173.davem at davemloft.net>
From: Kazunori MIYAZAWA <kazunori at miyazawa.org>
Date: Wed, 21 May 2008 13:26:11 -0700
Subject: af_key: Fix selector family initialization.

From: Kazunori MIYAZAWA <kazunori at miyazawa.org>

[ upstream commit: 4da5105687e0993a3bbdcffd89b2b94d9377faab ]

This propagates the xfrm_user fix made in commit
bcf0dda8d2408fe1c1040cdec5a98e5fcad2ac72 ("[XFRM]: xfrm_user: fix
selector family initialization")

Based upon a bug report from, and tested by, Alan Swanson.

Signed-off-by: Kazunori MIYAZAWA <kazunori at miyazawa.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Chris Wright <chrisw at sous-sol.org>
---
 net/key/af_key.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1219,7 +1219,7 @@ static struct xfrm_state * pfkey_msg2xfr
 		x->sel.prefixlen_s = addr->sadb_address_prefixlen;
 	}
 
-	if (x->props.mode == XFRM_MODE_TRANSPORT)
+	if (!x->sel.family)
 		x->sel.family = x->props.family;
 
 	if (ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1]) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -r1.462 -r1.463
--- kernel.spec	9 Jun 2008 22:12:37 -0000	1.462
+++ kernel.spec	9 Jun 2008 22:47:41 -0000	1.463
@@ -619,6 +619,7 @@
 
 Patch430: linux-2.6-net-silence-noisy-printks.patch
 Patch431: linux-2.6-netlink-fix-parse-of-nested-attributes.patch
+Patch432: linux-2.6-af_key-fix-selector-family-initialization.patch
 
 Patch440: linux-2.6-sha_alignment.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
@@ -1095,6 +1096,8 @@
 ApplyPatch linux-2.6-net-silence-noisy-printks.patch
 # fix netlink message parsing
 ApplyPatch linux-2.6-netlink-fix-parse-of-nested-attributes.patch
+# fix af_key socket init
+ApplyPatch linux-2.6-af_key-fix-selector-family-initialization.patch
 
 # Misc fixes
 # Fix SHA1 alignment problem on ia64
@@ -1812,6 +1815,9 @@
 
 
 %changelog
+* Mon Jun 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.6-23
+- Fix init of af_key sockets (#450499)
+
 * Mon Jun 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.6-22
 - Copy netlink message parsing bug fix from Fedora 9.