4.9-stable patches

[thirdparty/kernel/stable-queue.git] / releases / 2.6.20.2 / fix-skb-data-reallocation-handling-in-ipsec.patch

From stable-bounces@linux.kernel.org Tue Feb 27 11:10:02 2007
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Tue, 27 Feb 2007 11:08:33 -0800 (PST)
Subject: Fix skb data reallocation handling in IPSEC
To: stable@kernel.org
Cc: bunk@stusta.de
Message-ID: <20070227.110833.38710283.davem@davemloft.net>

From: Arnaldo Carvalho de Melo <acme@redhat.com>

[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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 net/ipv4/xfrm4_mode_tunnel.c |    1 +
 1 file changed, 1 insertion(+)

--- linux-2.6.20.1.orig/net/ipv4/xfrm4_mode_tunnel.c
+++ linux-2.6.20.1/net/ipv4/xfrm4_mode_tunnel.c
@@ -84,6 +84,7 @@ static int xfrm4_tunnel_input(struct xfr
 	    (err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC)))
 		goto out;
 
+	iph = skb->nh.iph;
 	if (x->props.flags & XFRM_STATE_DECAP_DSCP)
 		ipv4_copy_dscp(iph, skb->h.ipiph);
 	if (!(x->props.flags & XFRM_STATE_NOECN))