Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4396b54 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4c3ae4d7

net/ipv4/xfrm4_mode_tunnel.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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)))

	    (err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC)))

		goto out;

		goto out;





	iph = skb->nh.iph;

	if (iph->protocol == IPPROTO_IPIP) {

	if (iph->protocol == IPPROTO_IPIP) {

		if (x->props.flags & XFRM_STATE_DECAP_DSCP)

		if (x->props.flags & XFRM_STATE_DECAP_DSCP)

			ipv4_copy_dscp(iph, skb->h.ipiph);

			ipv4_copy_dscp(iph, skb->h.ipiph);