| commit | 55eff0eb7460c3d50716ed9eccf22257b046ca92 | [log] [tgz] |
|---|---|---|
| author | Miaohe Lin <linmiaohe@huawei.com> | Sat Aug 15 04:44:31 2020 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Sun Aug 16 15:33:49 2020 -0700 |
| tree | c75b285de0dca2367dbe68eee0252ea49ed24eb7 | |
| parent | f8414a8d886b613b90d9fdf7cda6feea313b1069 [diff] |
net: Fix potential wrong skb->protocol in skb_vlan_untag()
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>