diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-02-24 18:12:42 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-26 11:43:01 -0800 |
| commit | e4396b544fa5c85e3c263e0bc92b0743a24ba818 (patch) | |
| tree | 834bc9f7a8e6f741654a61ecdea60ec08759334f | |
| parent | 4c3ae4d7e727eac6f6eb23587cef0413734d4ae1 (diff) | |
| download | op-kernel-dev-e4396b544fa5c85e3c263e0bc92b0743a24ba818.zip op-kernel-dev-e4396b544fa5c85e3c263e0bc92b0743a24ba818.tar.gz | |
[XFRM_TUNNEL]: Reload header pointer after pskb_may_pull/pskb_expand_head
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>
| -rw-r--r-- | net/ipv4/xfrm4_mode_tunnel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c index e1cab33..ceb4376 100644 --- a/net/ipv4/xfrm4_mode_tunnel.c +++ b/net/ipv4/xfrm4_mode_tunnel.c @@ -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); |
