Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / net / ipv6 / ipcomp6.c

diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index b357db4..5abb89b 100644 (file)
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -123,7 +123,7 @@ static int ipcomp6_output(struct sk_buff **pskb)
        int err;
        struct dst_entry *dst = (*pskb)->dst;
        struct xfrm_state *x = dst->xfrm;
-       struct ipv6hdr *tmp_iph = NULL, *iph, *top_iph;
+       struct ipv6hdr *iph, *top_iph;
        int hdr_len = 0;
        struct ipv6_comp_hdr *ipch;
        struct ipcomp_data *ipcd = x->data;
@@ -140,11 +140,15 @@ static int ipcomp6_output(struct sk_buff **pskb)
 
        spin_lock_bh(&x->lock);
 
-       err = xfrm_check_output(x, *pskb, AF_INET6);
+       err = xfrm_state_check(x, *pskb);
        if (err)
                goto error;
 
        if (x->props.mode) {
+               err = xfrm6_tunnel_check_size(*pskb);
+               if (err)
+                       goto error;
+
                hdr_len = sizeof(struct ipv6hdr);
                nexthdr = IPPROTO_IPV6;
                iph = (*pskb)->nh.ipv6h;
@@ -189,19 +193,11 @@ static int ipcomp6_output(struct sk_buff **pskb)
        if ((dlen + sizeof(struct ipv6_comp_hdr)) >= plen) {
                goto out_ok;
        }
-       memcpy(start, scratch, dlen);
-       pskb_trim(*pskb, hdr_len+dlen);
+       memcpy(start + sizeof(struct ip_comp_hdr), scratch, dlen);
+       pskb_trim(*pskb, hdr_len + dlen + sizeof(struct ip_comp_hdr));
 
        /* insert ipcomp header and replace datagram */
-       tmp_iph = kmalloc(hdr_len, GFP_ATOMIC);
-       if (!tmp_iph) {
-               err = -ENOMEM;
-               goto error;
-       }
-       memcpy(tmp_iph, (*pskb)->nh.raw, hdr_len);
-       top_iph = (struct ipv6hdr*)skb_push(*pskb, sizeof(struct ipv6_comp_hdr));
-       memcpy(top_iph, tmp_iph, hdr_len);
-       kfree(tmp_iph);
+       top_iph = (*pskb)->nh.ipv6h;
 
        if (x->props.mode && (x->props.flags & XFRM_STATE_NOECN))
                IP6_ECN_clear(top_iph);
@@ -258,6 +254,66 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
        xfrm_state_put(x);
 }
 
+static struct xfrm_state *ipcomp6_tunnel_create(struct xfrm_state *x)
+{
+       struct xfrm_state *t = NULL;
+
+       t = xfrm_state_alloc();
+       if (!t)
+               goto out;
+
+       t->id.proto = IPPROTO_IPV6;
+       t->id.spi = xfrm6_tunnel_alloc_spi((xfrm_address_t *)&x->props.saddr);
+       memcpy(t->id.daddr.a6, x->id.daddr.a6, sizeof(struct in6_addr));
+       memcpy(&t->sel, &x->sel, sizeof(t->sel));
+       t->props.family = AF_INET6;
+       t->props.mode = 1;
+       memcpy(t->props.saddr.a6, x->props.saddr.a6, sizeof(struct in6_addr));
+
+       t->type = xfrm_get_type(IPPROTO_IPV6, t->props.family);
+       if (t->type == NULL)
+               goto error;
+
+       if (t->type->init_state(t, NULL))
+               goto error;
+
+       t->km.state = XFRM_STATE_VALID;
+       atomic_set(&t->tunnel_users, 1);
+
+out:
+       return t;
+
+error:
+       xfrm_state_put(t);
+       goto out;
+}
+
+static int ipcomp6_tunnel_attach(struct xfrm_state *x)
+{
+       int err = 0;
+       struct xfrm_state *t = NULL;
+       u32 spi;
+
+       spi = xfrm6_tunnel_spi_lookup((xfrm_address_t *)&x->props.saddr);
+       if (spi)
+               t = xfrm_state_lookup((xfrm_address_t *)&x->id.daddr,
+                                             spi, IPPROTO_IPV6, AF_INET6);
+       if (!t) {
+               t = ipcomp6_tunnel_create(x);
+               if (!t) {
+                       err = -EINVAL;
+                       goto out;
+               }
+               xfrm_state_insert(t);
+               xfrm_state_hold(t);
+       }
+       x->tunnel = t;
+       atomic_inc(&t->tunnel_users);
+
+out:
+       return err;
+}
+
 static void ipcomp6_free_data(struct ipcomp_data *ipcd)
 {
        if (ipcd->tfm)
@@ -271,8 +327,11 @@ static void ipcomp6_destroy(struct xfrm_state *x)
        struct ipcomp_data *ipcd = x->data;
        if (!ipcd)
                return;
+       xfrm_state_delete_tunnel(x);
        ipcomp6_free_data(ipcd);
        kfree(ipcd);
+
+       xfrm6_tunnel_free_spi((xfrm_address_t *)&x->props.saddr);
 }
 
 static int ipcomp6_init_state(struct xfrm_state *x, void *args)
@@ -291,7 +350,7 @@ static int ipcomp6_init_state(struct xfrm_state *x, void *args)
                goto error;
 
        memset(ipcd, 0, sizeof(*ipcd));
-       x->props.header_len = sizeof(struct ipv6_comp_hdr);
+       x->props.header_len = 0;
        if (x->props.mode)
                x->props.header_len += sizeof(struct ipv6hdr);
        
@@ -303,6 +362,12 @@ static int ipcomp6_init_state(struct xfrm_state *x, void *args)
        if (!ipcd->tfm)
                goto error;
 
+       if (x->props.mode) {
+               err = ipcomp6_tunnel_attach(x);
+               if (err)
+                       goto error;
+       }
+
        calg_desc = xfrm_calg_get_byname(x->calg->alg_name);
        BUG_ON(!calg_desc);
        ipcd->threshold = calg_desc->uinfo.comp.threshold;