Re: Fw: ipsec hang

[Patrick McHardy <kaber@trash.net>]

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

Bill Crowell wrote:

> Re the bk12, is there just 1 patch that I should install to 2.6.10-rc2 
> to test IPSec? If I don't fiddle with the mm code, we might be able to 
> make some progress on this part. I just love simultaneous equations 
> with 1000 or more variables... ;-)

Patch is attached.

Regards
Patrick



[-- Attachment #2: x --]
[-- Type: text/plain, Size: 1239 bytes --]

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/11/23 18:21:09-08:00 kaber@trash.net 
#   [XFRM]: Fix endless loop in xfrm_policy_insert
#   
#   The patch 'Fix policy update bug when increasing
#   priority of last policy' broke this, when a policy
#   with lower priority than an existing policy is inserted
#   xfrm_policy_insert loops forever.
#   
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
#   Signed-off-by: David S. Miller <davem@davemloft.net>
# 
# net/xfrm/xfrm_policy.c
#   2004/11/23 18:20:49-08:00 kaber@trash.net +1 -0
#   [XFRM]: Fix endless loop in xfrm_policy_insert
#   
#   The patch 'Fix policy update bug when increasing
#   priority of last policy' broke this, when a policy
#   with lower priority than an existing policy is inserted
#   xfrm_policy_insert loops forever.
#   
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
#   Signed-off-by: David S. Miller <davem@davemloft.net>
# 
diff -Nru a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
--- a/net/xfrm/xfrm_policy.c	2004-11-30 00:51:18 +01:00
+++ b/net/xfrm/xfrm_policy.c	2004-11-30 00:51:18 +01:00
@@ -353,6 +353,7 @@
 			newpos = p;
 		if (delpol)
 			break;
+		p = &pol->next;
 	}
 	if (newpos)
 		p = newpos;