[IPSEC] beet: Fix extension header support on output
authorHerbert Xu <herbert@gondor.apana.org.au>
Wed, 10 Oct 2007 22:42:23 +0000 (15:42 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 10 Oct 2007 23:55:53 +0000 (16:55 -0700)
The beet output function completely kills any extension headers by replacing
them with the IPv6 header.  This is because it essentially ignores the
result of ip6_find_1stfragopt by simply acting as if there aren't any
extension headers.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/xfrm6_mode_beet.c

index 65e6b2a7fb3105a7b470821224b166ee32373e61..d9366dfbf86892201582f8226e1832528edfd415 100644 (file)
@@ -44,9 +44,9 @@ static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb)
        hdr_len = ip6_find_1stfragopt(skb, &prevhdr);
        memmove(skb->data, iph, hdr_len);
 
-       skb_set_mac_header(skb, offsetof(struct ipv6hdr, nexthdr));
+       skb_set_mac_header(skb, (prevhdr - x->props.header_len) - skb->data);
        skb_reset_network_header(skb);
-       skb_set_transport_header(skb, sizeof(struct ipv6hdr));
+       skb_set_transport_header(skb, hdr_len);
        top_iph = ipv6_hdr(skb);
 
        ipv6_addr_copy(&top_iph->saddr, (struct in6_addr *)&x->props.saddr);