]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
netfilter: nft_payload: restore vlan q-in-q match support
authorPablo Neira Ayuso <pablo@netfilter.org>
Thu, 9 May 2024 21:02:24 +0000 (23:02 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 16 Jun 2024 11:39:48 +0000 (13:39 +0200)
commit748cf3c26cfd8166d6c5b4ae43bba20fa002c327
tree9823fe6c3336d116d907cc9e0698023162720230
parent25ea5377e3d2921a0f96ae2551f5ab1b36825dd4
netfilter: nft_payload: restore vlan q-in-q match support

[ Upstream commit aff5c01fa1284d606f8e7cbdaafeef2511bb46c1 ]

Revert f6ae9f120dad ("netfilter: nft_payload: add C-VLAN support").

f41f72d09ee1 ("netfilter: nft_payload: simplify vlan header handling")
already allows to match on inner vlan tags by subtract the vlan header
size to the payload offset which has been popped and stored in skbuff
metadata fields.

Fixes: f6ae9f120dad ("netfilter: nft_payload: add C-VLAN support")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/netfilter/nft_payload.c