Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c
index c679a3c..00cfdee 100644 (file)
--- a/net/ipv6/xfrm6_input.c
+++ b/net/ipv6/xfrm6_input.c
@@ -9,7 +9,11 @@
  *             IPv6 support
  */
 
+#include <linux/module.h>
 #include <linux/string.h>
+#include <linux/netfilter.h>
+#include <linux/netfilter_ipv6.h>
+#include <net/dsfield.h>
 #include <net/inet_ecn.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
@@ -20,28 +24,26 @@ static inline void ipip6_ecn_decapsulate(struct sk_buff *skb)
        struct ipv6hdr *outer_iph = skb->nh.ipv6h;
        struct ipv6hdr *inner_iph = skb->h.ipv6h;
 
-       if (INET_ECN_is_ce(ip6_get_dsfield(outer_iph)) &&
-           INET_ECN_is_not_ce(ip6_get_dsfield(inner_iph)))
+       if (INET_ECN_is_ce(ipv6_get_dsfield(outer_iph)))
                IP6_ECN_set_ce(inner_iph);
 }
 
-int xfrm6_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
+int xfrm6_rcv_spi(struct sk_buff *skb, u32 spi)
 {
-       struct sk_buff *skb = *pskb;
        int err;
-       u32 spi, seq;
-       struct sec_decap_state xfrm_vec[XFRM_MAX_DEPTH];
+       u32 seq;
+       struct xfrm_state *xfrm_vec[XFRM_MAX_DEPTH];
        struct xfrm_state *x;
        int xfrm_nr = 0;
        int decaps = 0;
-       int nexthdr = 0;
-       u8 *prevhdr = NULL;
+       int nexthdr;
+       unsigned int nhoff;
 
-       ip6_find_1stfragopt(skb, &prevhdr);
-       nexthdr = *prevhdr;
-       *nhoffp = prevhdr - skb->nh.raw;
+       nhoff = IP6CB(skb)->nhoff;
+       nexthdr = skb->nh.raw[nhoff];
 
-       if ((err = xfrm_parse_spi(skb, nexthdr, &spi, &seq)) != 0)
+       seq = 0;
+       if (!spi && (err = xfrm_parse_spi(skb, nexthdr, &spi, &seq)) != 0)
                goto drop;
        
        do {
@@ -63,10 +65,12 @@ int xfrm6_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
                if (xfrm_state_check_expire(x))
                        goto drop_unlock;
 
-               nexthdr = x->type->input(x, &(xfrm_vec[xfrm_nr].decap), skb);
+               nexthdr = x->type->input(x, skb);
                if (nexthdr <= 0)
                        goto drop_unlock;
 
+               skb->nh.raw[nhoff] = nexthdr;
+
                if (x->props.replay_window)
                        xfrm_replay_advance(x, seq);
 
@@ -75,7 +79,7 @@ int xfrm6_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
 
                spin_unlock(&x->lock);
 
-               xfrm_vec[xfrm_nr++].xvec = x;
+               xfrm_vec[xfrm_nr++] = x;
 
                if (x->props.mode) { /* XXX */
                        if (nexthdr != IPPROTO_IPV6)
@@ -85,6 +89,8 @@ int xfrm6_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
                        if (skb_cloned(skb) &&
                            pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
                                goto drop;
+                       if (x->props.flags & XFRM_STATE_DECAP_DSCP)
+                               ipv6_copy_dscp(skb->nh.ipv6h, skb->h.ipv6h);
                        if (!(x->props.flags & XFRM_STATE_NOECN))
                                ipip6_ecn_decapsulate(skb);
                        skb->mac.raw = memmove(skb->data - skb->mac_len,
@@ -112,10 +118,13 @@ int xfrm6_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
        if (xfrm_nr + skb->sp->len > XFRM_MAX_DEPTH)
                goto drop;
 
-       memcpy(skb->sp->x+skb->sp->len, xfrm_vec, xfrm_nr*sizeof(struct sec_decap_state));
+       memcpy(skb->sp->xvec + skb->sp->len, xfrm_vec,
+              xfrm_nr * sizeof(xfrm_vec[0]));
        skb->sp->len += xfrm_nr;
        skb->ip_summed = CHECKSUM_NONE;
 
+       nf_reset(skb);
+
        if (decaps) {
                if (!(skb->dev->flags&IFF_LOOPBACK)) {
                        dst_release(skb->dst);
@@ -124,7 +133,16 @@ int xfrm6_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
                netif_rx(skb);
                return -1;
        } else {
+#ifdef CONFIG_NETFILTER
+               skb->nh.ipv6h->payload_len = htons(skb->len);
+               __skb_push(skb, skb->data - skb->nh.raw);
+
+               NF_HOOK(PF_INET6, NF_IP6_PRE_ROUTING, skb, skb->dev, NULL,
+                       ip6_rcv_finish);
+               return -1;
+#else
                return 1;
+#endif
        }
 
 drop_unlock:
@@ -132,7 +150,14 @@ drop_unlock:
        xfrm_state_put(x);
 drop:
        while (--xfrm_nr >= 0)
-               xfrm_state_put(xfrm_vec[xfrm_nr].xvec);
+               xfrm_state_put(xfrm_vec[xfrm_nr]);
        kfree_skb(skb);
        return -1;
 }
+
+EXPORT_SYMBOL(xfrm6_rcv_spi);
+
+int xfrm6_rcv(struct sk_buff **pskb)
+{
+       return xfrm6_rcv_spi(*pskb, 0);
+}