[XFRM] MIPv6: Fix to input RO state correctly.
authorMasahide NAKAMURA <nakam@linux-ipv6.org>
Fri, 21 Dec 2007 04:41:57 +0000 (20:41 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2008 22:59:37 +0000 (14:59 -0800)
Disable spin_lock during xfrm_type.input() function.
Follow design as IPsec inbound does.

Signed-off-by: Masahide NAKAMURA <nakam@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/xfrm6_input.c

index 74f3aacebb5e695430bfb05ba0f13ed105af9e57..f835ab458f5b73220431af58f92b5d7575eb9b50 100644 (file)
@@ -63,10 +63,26 @@ int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,
        struct xfrm_state *x = NULL;
        int wildcard = 0;
        xfrm_address_t *xany;
-       struct xfrm_state *xfrm_vec_one = NULL;
        int nh = 0;
        int i = 0;
 
+       /* Allocate new secpath or COW existing one. */
+       if (!skb->sp || atomic_read(&skb->sp->refcnt) != 1) {
+               struct sec_path *sp;
+
+               sp = secpath_dup(skb->sp);
+               if (!sp) {
+                       goto drop;
+               }
+               if (skb->sp)
+                       secpath_put(skb->sp);
+               skb->sp = sp;
+       }
+
+       if (1 + skb->sp->len == XFRM_MAX_DEPTH) {
+               goto drop;
+       }
+
        xany = (xfrm_address_t *)&in6addr_any;
 
        for (i = 0; i < 3; i++) {
@@ -119,47 +135,35 @@ int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,
                        continue;
                }
 
+               spin_unlock(&x->lock);
+
                nh = x->type->input(x, skb);
                if (nh <= 0) {
-                       spin_unlock(&x->lock);
                        xfrm_state_put(x);
                        x = NULL;
                        continue;
                }
 
-               x->curlft.bytes += skb->len;
-               x->curlft.packets++;
-
-               spin_unlock(&x->lock);
-
-               xfrm_vec_one = x;
+               /* Found a state */
                break;
        }
 
-       if (!xfrm_vec_one)
+       if (!x) {
                goto drop;
-
-       /* Allocate new secpath or COW existing one. */
-       if (!skb->sp || atomic_read(&skb->sp->refcnt) != 1) {
-               struct sec_path *sp;
-               sp = secpath_dup(skb->sp);
-               if (!sp)
-                       goto drop;
-               if (skb->sp)
-                       secpath_put(skb->sp);
-               skb->sp = sp;
        }
 
-       if (1 + skb->sp->len > XFRM_MAX_DEPTH)
-               goto drop;
+       skb->sp->xvec[skb->sp->len++] = x;
+
+       spin_lock(&x->lock);
 
-       skb->sp->xvec[skb->sp->len] = xfrm_vec_one;
-       skb->sp->len ++;
+       x->curlft.bytes += skb->len;
+       x->curlft.packets++;
+
+       spin_unlock(&x->lock);
 
        return 1;
+
 drop:
-       if (xfrm_vec_one)
-               xfrm_state_put(xfrm_vec_one);
        return -1;
 }