Commit e1cb68bf authored by Florian Westphal's avatar Florian Westphal Committed by openeuler-sync-bot
Browse files

netfilter: br_netfilter: fix recent physdev match breakage

stable inclusion
from stable-v5.10.179
commit 3224458030a2b44eeaeed5af9d1824c2ae0eb30e
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C809

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=3224458030a2b44eeaeed5af9d1824c2ae0eb30e



--------------------------------

[ Upstream commit 94623f57 ]

Recent attempt to ensure PREROUTING hook is executed again when a
decrypted ipsec packet received on a bridge passes through the network
stack a second time broke the physdev match in INPUT hook.

We can't discard the nf_bridge info strct from sabotage_in hook, as
this is needed by the physdev match.

Keep the struct around and handle this with another conditional instead.

Fixes: 2b272bb5 ("netfilter: br_netfilter: disable sabotage_in hook after first suppression")
Reported-and-tested-by: default avatarFarid BENAMROUCHE <fariouche@yahoo.fr>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
(cherry picked from commit 4c5b6d3f)
parent dd063da7
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment