]> err.no Git - linux-2.6/commit
[IPSEC]: Temporarily remove locks around copying of non-atomic fields
authorHerbert Xu <herbert@gondor.apana.org.au>
Mon, 26 Nov 2007 11:07:34 +0000 (19:07 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 26 Nov 2007 11:07:34 +0000 (19:07 +0800)
commit8053fc3de720e1027d690f892ff7d7c1737fdd9d
tree0437efa29587beb5ebb174c402f7954cfde2269a
parent7f9c33e515353ea91afc62341161fead19e78567
[IPSEC]: Temporarily remove locks around copying of non-atomic fields

The change 050f009e16f908932070313c1745d09dc69fd62b

[IPSEC]: Lock state when copying non-atomic fields to user-space

caused a regression.

Ingo Molnar reports that it causes a potential dead-lock found by the
lock validator as it tries to take x->lock within xfrm_state_lock while
numerous other sites take the locks in opposite order.

For 2.6.24, the best fix is to simply remove the added locks as that puts
us back in the same state as we've been in for years.  For later kernels
a proper fix would be to reverse the locking order for every xfrm state
user such that if x->lock is taken together with xfrm_state_lock then
it is to be taken within it.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
net/key/af_key.c
net/xfrm/xfrm_user.c