Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9473e1f631de339c50bde1e3bd09e1045fe90fd5
Commit:     9473e1f631de339c50bde1e3bd09e1045fe90fd5
Parent:     a1b051405bc16222d92c73b0c26d65b333a154ee
Author:     Masahide NAKAMURA <[EMAIL PROTECTED]>
AuthorDate: Thu Dec 20 20:41:57 2007 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 14:59:37 2008 -0800

    [XFRM] MIPv6: Fix to input RO state correctly.
    
    Disable spin_lock during xfrm_type.input() function.
    Follow design as IPsec inbound does.
    
    Signed-off-by: Masahide NAKAMURA <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/ipv6/xfrm6_input.c |   54 +++++++++++++++++++++++++----------------------
 1 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c
index 74f3aac..f835ab4 100644
--- a/net/ipv6/xfrm6_input.c
+++ b/net/ipv6/xfrm6_input.c
@@ -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;
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to