]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
netfilter: nf_tables_offload: check FLOW_DISSECTOR_KEY_BASIC in VLAN transfer logic
authorPablo Neira Ayuso <pablo@netfilter.org>
Fri, 18 Jun 2021 23:25:14 +0000 (01:25 +0200)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 13 Aug 2021 07:30:54 +0000 (09:30 +0200)
commit22c5f31182778cc8c26a5ed1110d07bcf7c4e0f8
treeb2dbead12bcc87df71c8ab55056b9fb1f379523d
parent5e7d3d1edcad9b96fe0ddfb155f0109856019f9a
netfilter: nf_tables_offload: check FLOW_DISSECTOR_KEY_BASIC in VLAN transfer logic

BugLink: https://bugs.launchpad.net/bugs/1938340
[ Upstream commit ea45fdf82cc90430bb7c280e5e53821e833782c5 ]

The VLAN transfer logic should actually check for
FLOW_DISSECTOR_KEY_BASIC, not FLOW_DISSECTOR_KEY_CONTROL. Moreover, do
not fallback to case 2) .n_proto is set to 802.1q or 802.1ad, if
FLOW_DISSECTOR_KEY_BASIC is unset.

Fixes: 783003f3bb8a ("netfilter: nftables_offload: special ethertype handling for VLAN")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
net/netfilter/nf_tables_offload.c