From: Hannes Frederic Sowa <hannes@stressinduktion.org>
Date: Fri, 13 Dec 2013 14:12:27 +0000 (+0100)
Subject: ipv6: fix illegal mac_header comparison on 32bit
X-Git-Tag: v3.12.8~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e6d67b46951976b726c1fe8d54b495ffae7e23d;p=thirdparty%2Fkernel%2Fstable.git

ipv6: fix illegal mac_header comparison on 32bit

Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c
index 34c6fff3ae848..06556d6e1a4db 100644
--- a/net/ipv6/udp_offload.c
+++ b/net/ipv6/udp_offload.c
@@ -88,7 +88,7 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb,
 
 		/* Check if there is enough headroom to insert fragment header. */
 		tnl_hlen = skb_tnl_header_len(skb);
-		if (skb->mac_header < (tnl_hlen + frag_hdr_sz)) {
+		if (skb_mac_header(skb) < skb->head + tnl_hlen + frag_hdr_sz) {
 			if (gso_pskb_expand_head(skb, tnl_hlen + frag_hdr_sz))
 				goto out;
 		}