summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLi RongQing <roy.qing.li@gmail.com>2015-04-29 08:42:44 +0800
committerSteffen Klassert <steffen.klassert@secunet.com>2015-04-29 13:53:46 +0200
commitbdddbf6996c0b9299efc97b8f66e06286f3aa8c9 (patch)
tree504d61ae096e3b3e4272b877638b49db2d33da22 /net
parent39376ccb1968ba9f83e2a880a8bf02ad5dea44e1 (diff)
downloadop-kernel-dev-bdddbf6996c0b9299efc97b8f66e06286f3aa8c9.zip
op-kernel-dev-bdddbf6996c0b9299efc97b8f66e06286f3aa8c9.tar.gz
xfrm: fix a race in xfrm_state_lookup_byspi
The returned xfrm_state should be hold before unlock xfrm_state_lock, otherwise the returned xfrm_state maybe be released. Fixes: c454997e6[{pktgen, xfrm} Introduce xfrm_state_lookup_byspi..] Cc: Fan Du <fan.du@intel.com> Signed-off-by: Li RongQing <roy.qing.li@gmail.com> Acked-by: Fan Du <fan.du@intel.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net')
-rw-r--r--net/xfrm/xfrm_state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index f5e39e3..96688cd 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -927,8 +927,8 @@ struct xfrm_state *xfrm_state_lookup_byspi(struct net *net, __be32 spi,
x->id.spi != spi)
continue;
- spin_unlock_bh(&net->xfrm.xfrm_state_lock);
xfrm_state_hold(x);
+ spin_unlock_bh(&net->xfrm.xfrm_state_lock);
return x;
}
spin_unlock_bh(&net->xfrm.xfrm_state_lock);
OpenPOWER on IntegriCloud