Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbb770e7 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

xfrm: Fix xfrm_policy_gc_lock handling. 



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: default avatarDavid S. Miller <davem@davemloft.net>
parent 19ecb6ba

net/xfrm/xfrm_policy.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -315,9 +315,9 @@ static void xfrm_policy_kill(struct xfrm_policy *policy) 
		return;

		return;

	}

	}





	spin_lock(&xfrm_policy_gc_lock);

	spin_lock_bh(&xfrm_policy_gc_lock);

	hlist_add_head(&policy->bydst, &xfrm_policy_gc_list);

	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);

	schedule_work(&xfrm_policy_gc_work);

}

}