vserver 1.9.3

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

diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 4977271..77b4ba6 100644 (file)
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -37,11 +37,11 @@
 #include <net/ipv6.h>
 #include <linux/icmpv6.h>
 
-int esp6_output(struct sk_buff **pskb)
+static int esp6_output(struct sk_buff *skb)
 {
        int err;
        int hdr_len;
-       struct dst_entry *dst = (*pskb)->dst;
+       struct dst_entry *dst = skb->dst;
        struct xfrm_state *x  = dst->xfrm;
        struct ipv6hdr *top_iph;
        struct ipv6_esp_hdr *esph;
@@ -54,17 +54,17 @@ int esp6_output(struct sk_buff **pskb)
        int nfrags;
 
        esp = x->data;
-       hdr_len = (*pskb)->h.raw - (*pskb)->data +
+       hdr_len = skb->h.raw - skb->data +
                  sizeof(*esph) + esp->conf.ivlen;
 
        /* Strip IP+ESP header. */
-       __skb_pull(*pskb, hdr_len);
+       __skb_pull(skb, hdr_len);
 
        /* Now skb is pure payload to encrypt */
        err = -ENOMEM;
 
        /* Round to block size */
-       clen = (*pskb)->len;
+       clen = skb->len;
 
        alen = esp->auth.icv_trunc_len;
        tfm = esp->conf.tfm;
@@ -73,24 +73,24 @@ int esp6_output(struct sk_buff **pskb)
        if (esp->conf.padlen)
                clen = (clen + esp->conf.padlen-1)&~(esp->conf.padlen-1);
 
-       if ((nfrags = skb_cow_data(*pskb, clen-(*pskb)->len+alen, &trailer)) < 0) {
+       if ((nfrags = skb_cow_data(skb, clen-skb->len+alen, &trailer)) < 0) {
                goto error;
        }
 
        /* Fill padding... */
        do {
                int i;
-               for (i=0; i<clen-(*pskb)->len - 2; i++)
+               for (i=0; i<clen-skb->len - 2; i++)
                        *(u8*)(trailer->tail + i) = i+1;
        } while (0);
-       *(u8*)(trailer->tail + clen-(*pskb)->len - 2) = (clen - (*pskb)->len)-2;
-       pskb_put(*pskb, trailer, clen - (*pskb)->len);
+       *(u8*)(trailer->tail + clen-skb->len - 2) = (clen - skb->len)-2;
+       pskb_put(skb, trailer, clen - skb->len);
 
-       top_iph = (struct ipv6hdr *)__skb_push(*pskb, hdr_len);
-       esph = (struct ipv6_esp_hdr *)(*pskb)->h.raw;
-       top_iph->payload_len = htons((*pskb)->len + alen - sizeof(*top_iph));
-       *(u8*)(trailer->tail - 1) = *(*pskb)->nh.raw;
-       *(*pskb)->nh.raw = IPPROTO_ESP;
+       top_iph = (struct ipv6hdr *)__skb_push(skb, hdr_len);
+       esph = (struct ipv6_esp_hdr *)skb->h.raw;
+       top_iph->payload_len = htons(skb->len + alen - sizeof(*top_iph));
+       *(u8*)(trailer->tail - 1) = *skb->nh.raw;
+       *skb->nh.raw = IPPROTO_ESP;
 
        esph->spi = x->id.spi;
        esph->seq_no = htonl(++x->replay.oseq);
@@ -106,7 +106,7 @@ int esp6_output(struct sk_buff **pskb)
                        if (!sg)
                                goto error;
                }
-               skb_to_sgvec(*pskb, sg, esph->enc_data+esp->conf.ivlen-(*pskb)->data, clen);
+               skb_to_sgvec(skb, sg, esph->enc_data+esp->conf.ivlen-skb->data, clen);
                crypto_cipher_encrypt(tfm, sg, sg, clen);
                if (unlikely(sg != &esp->sgbuf[0]))
                        kfree(sg);
@@ -118,9 +118,9 @@ int esp6_output(struct sk_buff **pskb)
        }
 
        if (esp->auth.icv_full_len) {
-               esp->auth.icv(esp, *pskb, (u8*)esph-(*pskb)->data,
+               esp->auth.icv(esp, skb, (u8*)esph-skb->data,
                        sizeof(struct ipv6_esp_hdr) + esp->conf.ivlen+clen, trailer->tail);
-               pskb_put(*pskb, trailer, alen);
+               pskb_put(skb, trailer, alen);
        }
 
        err = 0;
@@ -129,7 +129,7 @@ error:
        return err;
 }
 
-int esp6_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struct sk_buff *skb)
+static int esp6_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struct sk_buff *skb)
 {
        struct ipv6hdr *iph;
        struct ipv6_esp_hdr *esph;
@@ -252,8 +252,8 @@ static u32 esp6_get_max_size(struct xfrm_state *x, int mtu)
        return mtu + x->props.header_len + esp->auth.icv_full_len;
 }
 
-void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
-               int type, int code, int offset, __u32 info)
+static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
+                     int type, int code, int offset, __u32 info)
 {
        struct ipv6hdr *iph = (struct ipv6hdr*)skb->data;
        struct ipv6_esp_hdr *esph = (struct ipv6_esp_hdr*)(skb->data+offset);
@@ -272,7 +272,7 @@ void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
        xfrm_state_put(x);
 }
 
-void esp6_destroy(struct xfrm_state *x)
+static void esp6_destroy(struct xfrm_state *x)
 {
        struct esp_data *esp = x->data;
 
@@ -298,17 +298,21 @@ void esp6_destroy(struct xfrm_state *x)
        kfree(esp);
 }
 
-int esp6_init_state(struct xfrm_state *x, void *args)
+static int esp6_init_state(struct xfrm_state *x, void *args)
 {
        struct esp_data *esp = NULL;
 
+       /* null auth and encryption can have zero length keys */
        if (x->aalg) {
-               if (x->aalg->alg_key_len == 0 || x->aalg->alg_key_len > 512)
+               if (x->aalg->alg_key_len > 512)
                        goto error;
        }
        if (x->ealg == NULL)
                goto error;
 
+       if (x->encap)
+               goto error;
+
        esp = kmalloc(sizeof(*esp), GFP_KERNEL);
        if (esp == NULL)
                return -ENOMEM;
@@ -398,7 +402,7 @@ static struct inet6_protocol esp6_protocol = {
        .flags          =       INET6_PROTO_NOPOLICY,
 };
 
-int __init esp6_init(void)
+static int __init esp6_init(void)
 {
        if (xfrm_register_type(&esp6_type, AF_INET6) < 0) {
                printk(KERN_INFO "ipv6 esp init: can't add xfrm type\n");