Miaohe Lin eedf146fbb net: Fix potential wrong skb->protocol in skb_vlan_untag()
[ Upstream commit 55eff0eb7460c3d50716ed9eccf22257b046ca92 ]

We may access the two bytes after vlan_hdr in vlan_set_encap_proto(). So
we should pull VLAN_HLEN + sizeof(unsigned short) in skb_vlan_untag() or
we may access the wrong data.

Fixes: 0d5501c1c828 ("net: Always untag vlan-tagged traffic on input.")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2020-09-03 11:21:15 +02:00
..
2020-08-21 11:01:54 +02:00
2019-05-08 07:19:07 +02:00
2019-12-05 15:35:12 +01:00
2019-09-16 08:19:32 +02:00
2019-06-22 08:17:22 +02:00
2016-10-20 11:23:08 -04:00
2020-05-20 08:15:39 +02:00
2020-07-22 09:10:48 +02:00
2019-03-23 13:19:44 +01:00
2019-11-28 18:28:28 +01:00