]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
netfilter: flowtable: Fix QinQ and pppoe support for inet table
authorPablo Neira Ayuso <pablo@netfilter.org>
Wed, 16 Mar 2022 10:19:43 +0000 (11:19 +0100)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 20 May 2022 12:39:12 +0000 (14:39 +0200)
commita9ede68c0caa530a69aa943fa188305b67dedcb0
treed4a90e55118189dc7c741f189d90a8a9f46b2f3d
parentbb656f373567bf0b82b47ada6bc406822824d5c3
netfilter: flowtable: Fix QinQ and pppoe support for inet table

BugLink: https://bugs.launchpad.net/bugs/1969110
[ Upstream commit 0492d857636e1c52cd71594a723c4b26a7b31978 ]

nf_flow_offload_inet_hook() does not check for 802.1q and PPPoE.
Fetch inner ethertype from these encapsulation protocols.

Fixes: 72efd585f714 ("netfilter: flowtable: add pppoe support")
Fixes: 4cd91f7c290f ("netfilter: flowtable: add vlan support")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 2a85c4cb3b1585adad7917dfa7d1889939bdec3e)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
include/net/netfilter/nf_flow_table.h
net/netfilter/nf_flow_table_inet.c
net/netfilter/nf_flow_table_ip.c