diff options
| author | Joakim Koskela <jookos@gmail.com> | 2008-08-06 02:39:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-06 02:39:30 -0700 |
| commit | eb49e63093498cd17382018495b8cfb5b4a679bd (patch) | |
| tree | a824e1d17f942d24d4c1853cdefb771cb6ff226e /net/ipv4/xfrm4_mode_beet.c | |
| parent | 9714be7da8b32f36d2468fe08ff603b6402df8cf (diff) | |
| download | blackbird-op-linux-eb49e63093498cd17382018495b8cfb5b4a679bd.tar.gz blackbird-op-linux-eb49e63093498cd17382018495b8cfb5b4a679bd.zip | |
ipsec: Interfamily IPSec BEET
Here's a revised version, based on Herbert's comments, of a fix for
the ipv6-inner, ipv4-outer interfamily ipsec beet mode. It fixes the
network header adjustment in interfamily, and doesn't reserve space
for the pseudo header anymore when we have ipv6 as the inner family.
Signed-off-by: Joakim Koskela <jookos@gmail.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_mode_beet.c')
| -rw-r--r-- | net/ipv4/xfrm4_mode_beet.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/xfrm4_mode_beet.c b/net/ipv4/xfrm4_mode_beet.c index 9c798abce736..63418185f524 100644 --- a/net/ipv4/xfrm4_mode_beet.c +++ b/net/ipv4/xfrm4_mode_beet.c @@ -47,8 +47,10 @@ static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb) if (unlikely(optlen)) hdrlen += IPV4_BEET_PHMAXLEN - (optlen & 4); - skb_set_network_header(skb, IPV4_BEET_PHMAXLEN - x->props.header_len - - hdrlen); + skb_set_network_header(skb, -x->props.header_len - + hdrlen + (XFRM_MODE_SKB_CB(skb)->ihl - sizeof(*top_iph))); + if (x->sel.family != AF_INET6) + skb->network_header += IPV4_BEET_PHMAXLEN; skb->mac_header = skb->network_header + offsetof(struct iphdr, protocol); skb->transport_header = skb->network_header + sizeof(*top_iph); |
