]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
ipsec: Fix deadlock in xfrm_state management.
authorDavid S. Miller <davem@davemloft.net>
Wed, 3 Sep 2008 03:14:15 +0000 (20:14 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 3 Sep 2008 03:14:15 +0000 (20:14 -0700)
commit37b08e34a98c664bea86e3fae718ac45a46b7276
tree8d0cc32bdbfda4d992177aeda56700bea0f918dd
parent06770843c2f0f929a6e0c758dc433902a01aabfb
ipsec: Fix deadlock in xfrm_state management.

Ever since commit 4c563f7669c10a12354b72b518c2287ffc6ebfb3
("[XFRM]: Speed up xfrm_policy and xfrm_state walking") it is
illegal to call __xfrm_state_destroy (and thus xfrm_state_put())
with xfrm_state_lock held.  If we do, we'll deadlock since we
have the lock already and __xfrm_state_destroy() tries to take
it again.

Fix this by pushing the xfrm_state_put() calls after the lock
is dropped.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/xfrm/xfrm_state.c