diff options
| author | Vlad Yasevich <vyasevich@gmail.com> | 2015-12-14 17:44:10 -0500 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-01-15 18:41:51 -0500 |
| commit | eb2c241e08e87ca7455da70608da5032b7f27423 (patch) | |
| tree | 29d86a917179ad6affd60bcb09b5d6ceb24eb46f /net | |
| parent | 6ff6d3c9349681cbe2559a6f47c93a8c716ece1d (diff) | |
| download | linux-stable-eb2c241e08e87ca7455da70608da5032b7f27423.tar.gz linux-stable-eb2c241e08e87ca7455da70608da5032b7f27423.tar.bz2 linux-stable-eb2c241e08e87ca7455da70608da5032b7f27423.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: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'net')
| -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 7c7b2c00e70b..e9d5556b92ef 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4108,7 +4108,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; |