[IPSEC]: Move state lock into x->type->input

This patch releases the lock on the state before calling
x->type->input.  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>

1 files changed, 7 insertions, 2 deletions

diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index d4b59ecb0b57..1b51d1eedbde 100644
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -370,6 +370,7 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)
         ip6h->flow_lbl[2] = 0;
         ip6h->hop_limit   = 0;
 
+        spin_lock(&x->lock);
         {
                 u8 auth_data[MAX_AH_AUTH_LEN];
 
@@ -378,13 +379,17 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)
                 skb_push(skb, hdr_len);
                 err = ah_mac_digest(ahp, skb, ah->auth_data);
                 if (err)
-                        goto free_out;
+                        goto unlock;
                 if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len)) {
                         LIMIT_NETDEBUG(KERN_WARNING "ipsec ah authentication error\n");
                         err = -EBADMSG;
-                        goto free_out;
                 }
         }
+unlock:
+        spin_unlock(&x->lock);
+
+        if (err)
+                goto free_out;
 
         skb->network_header += ah_hlen;
         memcpy(skb_network_header(skb), tmp_hdr, hdr_len);