rpms/kernel/F-10 linux-2.6-net-xfrm-fix-spin-unlock.patch, NONE, 1.1 kernel.spec, 1.1306, 1.1307

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9930

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-net-xfrm-fix-spin-unlock.patch 
Log Message:
Fix locking in net/xfrm/xfrm_state.c (f11#489764)

linux-2.6-net-xfrm-fix-spin-unlock.patch:

--- NEW FILE linux-2.6-net-xfrm-fix-spin-unlock.patch ---
xfrm: spin_lock() should be spin_unlock()

spin_lock() should be spin_unlock() in xfrm_state_walk_done().

caused by:
commit 12a169e7d8f4b1c95252d8b04ed0f1033ed7cfe2
"ipsec: Put dumpers on the dump list"

Reported-by: Marc Milgram <mmilgram at redhat.com>
Signed-off-by: Chuck Ebbert <cebbert at redhat.com>
---

rh bug 489764

--- linux-2.6.29.noarch.orig/net/xfrm/xfrm_state.c
+++ linux-2.6.29.noarch/net/xfrm/xfrm_state.c
@@ -1615,7 +1615,7 @@ void xfrm_state_walk_done(struct xfrm_st
 
 	spin_lock_bh(&xfrm_state_lock);
 	list_del(&walk->all);
-	spin_lock_bh(&xfrm_state_lock);
+	spin_unlock_bh(&xfrm_state_lock);
 }
 EXPORT_SYMBOL(xfrm_state_walk_done);
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1306
retrieving revision 1.1307
diff -u -r1.1306 -r1.1307
--- kernel.spec	26 Mar 2009 19:53:20 -0000	1.1306
+++ kernel.spec	26 Mar 2009 22:36:15 -0000	1.1307
@@ -628,6 +628,8 @@
 Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
 Patch602: alsa-rewrite-hw_ptr-updaters.patch
 
+Patch640: linux-2.6-net-xfrm-fix-spin-unlock.patch
+
 Patch670: linux-2.6-ata-quirk.patch
 
 Patch680: linux-2.6-rt2x00-asus-leds.patch
@@ -1147,6 +1149,7 @@
 ApplyPatch alsa-rewrite-hw_ptr-updaters.patch
 
 # Networking
+ApplyPatch linux-2.6-net-xfrm-fix-spin-unlock.patch
 
 # Misc fixes
 # The input layer spews crap no-one cares about.
@@ -1793,6 +1796,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Mar 26 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-7
+- Fix locking in net/xfrm/xfrm_state.c (f11#489764)
+
 * Wed Mar 26 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-6
 - Add upstream relatime patches but don't make relatime the default.