]> git.baikalelectronics.ru Git - kernel.git/commit
netfilter: tproxy: fix deadlock due to missing BH disable
authorFlorian Westphal <fw@strlen.de>
Fri, 3 Mar 2023 09:58:56 +0000 (10:58 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Mar 2023 07:32:51 +0000 (08:32 +0100)
commitf70bbee23927eb8668017c42582c7693371340f6
tree77fc4c4ab2afabec5da73aefc333fd9cdf1f2c6f
parent074b489b8e1da50dd9de36f4f5d68f3c13c03134
netfilter: tproxy: fix deadlock due to missing BH disable

[ Upstream commit 4a02426787bf024dafdb79b362285ee325de3f5e ]

The xtables packet traverser performs an unconditional local_bh_disable(),
but the nf_tables evaluation loop does not.

Functions that are called from either xtables or nftables must assume
that they can be called in process context.

inet_twsk_deschedule_put() assumes that no softirq interrupt can occur.
If tproxy is used from nf_tables its possible that we'll deadlock
trying to aquire a lock already held in process context.

Add a small helper that takes care of this and use it.

Link: https://lore.kernel.org/netfilter-devel/401bd6ed-314a-a196-1cdc-e13c720cc8f2@balasys.hu/
Fixes: 5e25179efc53 ("netfilter: nf_tables: Add native tproxy support")
Reported-and-tested-by: Major Dávid <major.david@balasys.hu>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
include/net/netfilter/nf_tproxy.h
net/ipv4/netfilter/nf_tproxy_ipv4.c
net/ipv6/netfilter/nf_tproxy_ipv6.c