[XFRM_TUNNEL]: Reload header pointer after pskb_may_pull/pskb_expand_head
authorArnaldo Carvalho de Melo <acme@redhat.com>
Sun, 25 Feb 2007 02:12:42 +0000 (18:12 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 26 Feb 2007 19:43:01 +0000 (11:43 -0800)
           Please consider applying, this was found on your latest
net-2.6 tree while playing around with that ip_hdr() + turn
skb->nh/h/mac pointers  as offsets on 64 bits idea :-)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/xfrm4_mode_tunnel.c

index e1cab33fdad1333506ce906b453e11ec8feee6bc..ceb4376f572ae8cd6c7b95845efc38d9820d84bc 100644 (file)
@@ -111,6 +111,7 @@ static int xfrm4_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
            (err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC)))
                goto out;
 
+       iph = skb->nh.iph;
        if (iph->protocol == IPPROTO_IPIP) {
                if (x->props.flags & XFRM_STATE_DECAP_DSCP)
                        ipv4_copy_dscp(iph, skb->h.ipiph);