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.1-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.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From foo@baz Wed Dec 30 19:52:45 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.
Fixes: a6e18ff1117 (vlan: Fix untag operations of stacked vlans with
REORDER_HEADER off)
CC: Nicolas Dichtel <[email protected]>
CC: Patrick McHardy <[email protected]>
Signed-off-by: Vladislav Yasevich <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/core/skbuff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -4200,7 +4200,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.1/ipv6-sctp-clone-options-to-avoid-use-after-free.patch
queue-4.1/skbuff-fix-offset-error-in-skb_reorder_vlan_header.patch
queue-4.1/sctp-update-the-netstamp_needed-counter-when-copying-sockets.patch
queue-4.1/sctp-also-copy-sk_tsflags-when-copying-the-socket.patch
queue-4.1/sctp-use-the-same-clock-as-if-sock-source-timestamps-were-on.patch
queue-4.1/vlan-fix-untag-operations-of-stacked-vlans-with-reorder_header-off.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
