Patch "skbuff: Fix offset error in skb_reorder_vlan_header" has been added to the 4.3-stable tree
Subsystems (2)
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 4.3-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-4.3 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Wed Dec 30 19:48:47 PST 2015
From: Vlad Yasevich <[email protected]>
Date: Mon, 14 Dec 2015 17:44:10 -0500
Subject: skbuff: Fix offset error in skb_reorder_vlan_header
From: Vlad Yasevich <[email protected]>
[ 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.
--- net/core/skbuff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/skbuff.c +1 -1
@@ -4268,7 +4268,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 [email protected] are
queue-4.3/ipv6-sctp-clone-options-to-avoid-use-after-free.patch queue-4.3/skbuff-fix-offset-error-in-skb_reorder_vlan_header.patch queue-4.3/sctp-update-the-netstamp_needed-counter-when-copying-sockets.patch queue-4.3/sctp-also-copy-sk_tsflags-when-copying-the-socket.patch queue-4.3/sctp-use-the-same-clock-as-if-sock-source-timestamps-were-on.patch queue-4.3/vlan-fix-untag-operations-of-stacked-vlans-with-reorder_header-off.patch