xfrm: Fix xfrm_policy_gc_lock handling.

Alexey Dobriyan · davem330 · commit bbb770e7ab9a · 2008-11-03T19:11:29.000-08:00
From: Alexey Dobriyan &lt;adobriyan@gmail.com&gt;

Based upon a lockdep trace by Simon Arlott.

xfrm_policy_kill() can be called from both BH and
non-BH contexts, so we have to grab xfrm_policy_gc_lock
with BH disabling.

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
@@ -315,9 +315,9 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
 		return;
 	}
 
-	spin_lock(&xfrm_policy_gc_lock);
+	spin_lock_bh(&xfrm_policy_gc_lock);
 	hlist_add_head(&policy->bydst, &xfrm_policy_gc_list);
-	spin_unlock(&xfrm_policy_gc_lock);
+	spin_unlock_bh(&xfrm_policy_gc_lock);
 
 	schedule_work(&xfrm_policy_gc_work);
 }

Original file line number	Diff line number	Diff line change
`@@ -315,9 +315,9 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)`
`315`	`315`	`return;`
`316`	`316`	`}`
`317`	`317`
`318`		`- spin_lock(&xfrm_policy_gc_lock);`
	`318`	`+ spin_lock_bh(&xfrm_policy_gc_lock);`
`319`	`319`	`hlist_add_head(&policy->bydst, &xfrm_policy_gc_list);`
`320`		`- spin_unlock(&xfrm_policy_gc_lock);`
	`320`	`+ spin_unlock_bh(&xfrm_policy_gc_lock);`
`321`	`321`
`322`	`322`	`schedule_work(&xfrm_policy_gc_work);`
`323`	`323`	`}`