rpms/kernel/F-9 linux-2.6-af_key-fix-selector-family-initialization.patch, NONE, 1.1 kernel.spec, 1.670, 1.671

[Chuck Ebbert (cebbert)]

Author: cebbert

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

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-52
- Fix init if af_key sockets (F8#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-9/kernel.spec,v
retrieving revision 1.670
retrieving revision 1.671
diff -u -r1.670 -r1.671
--- kernel.spec	9 Jun 2008 21:10:21 -0000	1.670
+++ kernel.spec	10 Jun 2008 00:39:40 -0000	1.671
@@ -614,6 +614,7 @@
 
 Patch430: linux-2.6-net-silence-noisy-printks.patch
 Patch432: linux-2.6-netlink-fix-parse-of-nested-attributes.patch
+Patch433: linux-2.6-af_key-fix-selector-family-initialization.patch
 
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch451: linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch
@@ -1149,6 +1150,8 @@
 ApplyPatch linux-2.6-net-silence-noisy-printks.patch
 # fix parse of netlink messages
 ApplyPatch linux-2.6-netlink-fix-parse-of-nested-attributes.patch
+# fix initialization of af_key sockets
+ApplyPatch linux-2.6-af_key-fix-selector-family-initialization.patch
 
 # Misc fixes
 # The input layer spews crap no-one cares about.
@@ -1838,6 +1841,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Jun 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.6-52
+- Fix init if af_key sockets (F8#450499)
+
 * Mon Jun 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.6-51
 - Sync ACPI patches with F-8 kernel.