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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Apr 2022 12:23:40 +0000 (14:23 +0200)
commit2a85c4cb3b1585adad7917dfa7d1889939bdec3e
treeeb67d8f8c38d95c72b828b2d25a2bc0f100be6d4
parent7ff346ee019bcf3b008a56a43b7aac45e771479b
netfilter: flowtable: Fix QinQ and pppoe support for inet table

[ 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>
include/net/netfilter/nf_flow_table.h
net/netfilter/nf_flow_table_inet.c
net/netfilter/nf_flow_table_ip.c