diff options
| author | Vlad Yasevich <vyasevich@gmail.com> | 2015-12-14 17:44:10 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-22 20:34:54 -0800 |
| commit | 1b6f95717611bb443d6d77553d97890005d897e6 (patch) | |
| tree | 2b184b7592312aa549394e719bd3c53ef526f757 | |
| parent | c57e93f9090f759c23eefa60283955051a4caf26 (diff) | |
| download | lwn-1b6f95717611bb443d6d77553d97890005d897e6.tar.gz lwn-1b6f95717611bb443d6d77553d97890005d897e6.zip | |
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 <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>
| -rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 9736d6a82fde..9ac664d8da33 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3997,7 +3997,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; |