]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8f7b33b) | patch
net: Fix potential wrong skb->protocol in skb_vlan_untag()
authorMiaohe Lin <linmiaohe@huawei.com>
Sat, 15 Aug 2020 08:44:31 +0000 (04:44 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 16 Aug 2020 22:33:49 +0000 (15:33 -0700)
commite2dd000fb9c530e20dd784cd4af6fb4277553290
treec75b285de0dca2367dbe68eee0252ea49ed24eb7tree | snapshot
parent8f7b33b632e32beec0dfcef4176230ec278c657bcommit | 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: c19996ddaf94 ("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>
net/core/skbuff.c diff | blob | history
Linux Kernel Source Tree.