From: Vlad Yasevich 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.16~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2af7df8919a74e4567878b1415f4dd5edbb75163;p=platform%2Fkernel%2Flinux-exynos.git skbuff: Fix offset error in skb_reorder_vlan_header [ 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 CC: Patrick McHardy Signed-off-by: Vladislav Yasevich Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 13ddacb9..f3f7d0a 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4200,7 +4200,7 @@ static struct sk_buff *skb_reorder_vlan_header(struct sk_buff *skb) return NULL; } - memmove(skb->data - ETH_HLEN, skb->data - skb->mac_len, + memmove(skb->data - ETH_HLEN, skb->data - skb->mac_len - VLAN_HLEN, 2 * ETH_ALEN); skb->mac_header += VLAN_HLEN; return skb;