From: Vlad Yasevich <vyasevich@gmail.com>
Date: Mon, 14 Dec 2015 22:44:10 +0000 (-0500)
Subject: skbuff: Fix offset error in skb_reorder_vlan_header
X-Git-Tag: v4.1.12-92~201^2~8
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6b54f22006c8d2a72a137106612495ad24ae4410;p=users%2Fjedix%2Flinux-maple.git

skbuff: Fix offset error in skb_reorder_vlan_header

Orabug: 22623883

[ Upstream commit f654861569872d10dcb79d9d7ca219b316f94ff0 ]

skb_reorder_vlan_header is called after the vlan header has
been pulled.  As a result the offset of the begining of
the mac header has been incrased by 4 bytes (VLAN_HLEN).
When moving the mac addresses, include this incrase in
the offset calcualation so that the mac addresses are
copied correctly.

Fixes: a6e18ff1117 (vlan: Fix untag operations of stacked vlans with REORDER_HEADER off)
CC: Nicolas Dichtel <nicolas.dichtel@6wind.com>
CC: Patrick McHardy <kaber@trash.net>
Signed-off-by: Vladislav Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Dan Duval <dan.duval@oracle.com>
(cherry picked from commit 2af7df8919a74e4567878b1415f4dd5edbb75163)

Conflict:

	net/core/skbuff.c
---

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 075d2e78c87ee..f3f7d0abcf63f 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -4200,7 +4200,8 @@ static struct sk_buff *skb_reorder_vlan_header(struct sk_buff *skb)
 		return NULL;
 	}
 
-	memmove(skb->data - ETH_HLEN, skb->data - VLAN_ETH_HLEN, 2 * ETH_ALEN);
+	memmove(skb->data - ETH_HLEN, skb->data - skb->mac_len - VLAN_HLEN,
+		2 * ETH_ALEN);
 	skb->mac_header += VLAN_HLEN;
 	return skb;
 }