]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
xfrm: Fix xfrm_policy_gc_lock handling.
authorAlexey Dobriyan <adobriyan@gmail.com>
Tue, 4 Nov 2008 03:11:29 +0000 (19:11 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 4 Nov 2008 03:11:29 +0000 (19:11 -0800)
From: Alexey Dobriyan <adobriyan@gmail.com>

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 <davem@davemloft.net>
net/xfrm/xfrm_policy.c

index 25872747762ca76b7ccd889d72549db0f6a694a3..058f04f54b9024857eb418321d6842bd448c744a 100644 (file)
@@ -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);
 }