]> git.karo-electronics.de Git - karo-tx-linux.git/commit
skbuff: Fix offset error in skb_reorder_vlan_header
authorVlad Yasevich <vyasevich@gmail.com>
Mon, 14 Dec 2015 22:44:10 +0000 (17:44 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 15 Dec 2015 05:30:41 +0000 (00:30 -0500)
commitf654861569872d10dcb79d9d7ca219b316f94ff0
tree47dce6fa52a1519dcfe132a7bb0b1f4f8a0a50ef
parent09ccfd238e5a0e670d8178cf50180ea81ae09ae1
skbuff: Fix offset error in skb_reorder_vlan_header

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>
net/core/skbuff.c