]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
vlan: Fix vlan insertion for packets without ethernet header
authorToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Thu, 29 Mar 2018 10:05:30 +0000 (19:05 +0900)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Mon, 27 Aug 2018 14:40:05 +0000 (16:40 +0200)
commit814fbcbd7810aa9158d2263c8627cfa06f796261
treee3c84ffe6b0608fdd7d8ca2bbde360b66c9bd2c0
parentbc31d66e381dadfbaa3b9858298c672ca1b0b31c
vlan: Fix vlan insertion for packets without ethernet header

BugLink: http://bugs.launchpad.net/bugs/1786352
[ Upstream commit c769accdf3d8a103940bea2979b65556718567e9 ]

In some situation vlan packets do not have ethernet headers. One example
is packets from tun devices. Users can specify vlan protocol in tun_pi
field instead of IP protocol. When we have a vlan device with reorder_hdr
disabled on top of the tun device, such packets from tun devices are
untagged in skb_vlan_untag() and vlan headers will be inserted back in
vlan_insert_inner_tag().

vlan_insert_inner_tag() however did not expect packets without ethernet
headers, so in such a case size argument for memmove() underflowed.

We don't need to copy headers for packets which do not have preceding
headers of vlan headers, so skip memmove() in that case.
Also don't write vlan protocol in skb->data when it does not have enough
room for it.

Fixes: cbe7128c4b92 ("vlan: Fix out of order vlan headers with reorder header off")
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
include/linux/if_vlan.h