Patch "skbuff: Fix offset error in skb_reorder_vlan_header" has been added to the 3.14-stable tree

Patch "skbuff: Fix offset error in skb_reorder_vlan_header" has been added to the 3.14-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    skbuff: Fix offset error in skb_reorder_vlan_header

to the 3.14-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     skbuff-fix-offset-error-in-skb_reorder_vlan_header.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Mon Jan 18 21:17:42 PST 2016
From: Vlad Yasevich <vyasevich@gmail.com>
Date: Mon, 14 Dec 2015 17:44:10 -0500
Subject: skbuff: Fix offset error in skb_reorder_vlan_header
Status: RO
Content-Length: 1169
Lines: 34

From: Vlad Yasevich <vyasevich@gmail.com>

[ 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>
---
 net/core/skbuff.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3997,7 +3997,7 @@ static struct sk_buff *skb_reorder_vlan_
 		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;


Patches currently in stable-queue which might be from vyasevich@gmail.com are

queue-3.14/sctp-use-the-same-clock-as-if-sock-source-timestamps-were-on.patch
queue-3.14/ipv6-sctp-clone-options-to-avoid-use-after-free.patch
queue-3.14/sctp-update-the-netstamp_needed-counter-when-copying-sockets.patch
queue-3.14/skbuff-fix-offset-error-in-skb_reorder_vlan_header.patch
queue-3.14/sctp-translate-host-order-to-network-order-when-setting-a-hmacid.patch
queue-3.14/vlan-fix-untag-operations-of-stacked-vlans-with-reorder_header-off.patch