[IPSEC]: Move state lock into x->type->output
This patch releases the lock on the state before calling x->type->output. It also adds the lock to the spots where they're currently needed. Most of those places (all except mip6) are expected to disappear with async crypto. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
050f009e16
commit
b7c6538cd8
@@ -172,7 +172,9 @@ static int mip6_destopt_output(struct xfrm_state *x, struct sk_buff *skb)
|
||||
len = ((char *)hao - (char *)dstopt) + sizeof(*hao);
|
||||
|
||||
memcpy(&hao->addr, &iph->saddr, sizeof(hao->addr));
|
||||
spin_lock_bh(&x->lock);
|
||||
memcpy(&iph->saddr, x->coaddr, sizeof(iph->saddr));
|
||||
spin_unlock_bh(&x->lock);
|
||||
|
||||
BUG_TRAP(len == x->props.header_len);
|
||||
dstopt->hdrlen = (x->props.header_len >> 3) - 1;
|
||||
@@ -381,7 +383,9 @@ static int mip6_rthdr_output(struct xfrm_state *x, struct sk_buff *skb)
|
||||
BUG_TRAP(rt2->rt_hdr.hdrlen == 2);
|
||||
|
||||
memcpy(&rt2->addr, &iph->daddr, sizeof(rt2->addr));
|
||||
spin_lock_bh(&x->lock);
|
||||
memcpy(&iph->daddr, x->coaddr, sizeof(iph->daddr));
|
||||
spin_unlock_bh(&x->lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user