diff options
| author | Miaohe Lin <linmiaohe@huawei.com> | 2020-08-15 04:44:31 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-03 11:19:22 +0200 |
| commit | c40fc891ca6c7ada3b10e5c16593e6469d4dfa22 (patch) | |
| tree | 8398d09ecb672726a46c25513f73db0b1769c6a7 /net/tipc | |
| parent | 61b7ab3507b38377aade089bcc2ddd77d7115e72 (diff) | |
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>
Diffstat (limited to 'net/tipc')
0 files changed, 0 insertions, 0 deletions