summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-10-10 15:42:23 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:55:53 -0700
commitbee0b40c0621396326d1c17b81833f59118a2d80 (patch)
tree94a79cef5ba189cda8e6cad2acd720da34c0463c
parent8bd170750400bfa5e14c3dd2e2d0f305e1ab0e57 (diff)
[IPSEC] beet: Fix extension header support on output
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>
-rw-r--r--net/ipv6/xfrm6_mode_beet.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/xfrm6_mode_beet.c b/net/ipv6/xfrm6_mode_beet.c
index 65e6b2a7fb3..d9366dfbf86 100644
--- a/net/ipv6/xfrm6_mode_beet.c
+++ b/net/ipv6/xfrm6_mode_beet.c
@@ -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);