From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Florian Westphal <fw@strlen.de>,
Eric Dumazet <eric.dumazet@gmail.com>,
Pablo Neira Ayuso <pablo@netfilter.org>,
Sasha Levin <sashal@kernel.org>,
kadlec@netfilter.org, netfilter-devel@vger.kernel.org,
coreteam@netfilter.org
Subject: [PATCH AUTOSEL 5.16 18/27] netfilter: egress: silence egress hook lockdep splats
Date: Wed, 9 Mar 2022 11:16:55 -0500 [thread overview]
Message-ID: <20220309161711.135679-18-sashal@kernel.org> (raw)
In-Reply-To: <20220309161711.135679-1-sashal@kernel.org>
From: Florian Westphal <fw@strlen.de>
[ Upstream commit 17a8f31bba7bac8cce4bd12bab50697da96e7710 ]
Netfilter assumes its called with rcu_read_lock held, but in egress
hook case it may be called with BH readlock.
This triggers lockdep splat.
In order to avoid to change all rcu_dereference() to
rcu_dereference_check(..., rcu_read_lock_bh_held()), wrap nf_hook_slow
with read lock/unlock pair.
Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
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/linux/netfilter_netdev.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/linux/netfilter_netdev.h b/include/linux/netfilter_netdev.h
index b4dd96e4dc8d..e6487a691136 100644
--- a/include/linux/netfilter_netdev.h
+++ b/include/linux/netfilter_netdev.h
@@ -101,7 +101,11 @@ static inline struct sk_buff *nf_hook_egress(struct sk_buff *skb, int *rc,
nf_hook_state_init(&state, NF_NETDEV_EGRESS,
NFPROTO_NETDEV, dev, NULL, NULL,
dev_net(dev), NULL);
+
+ /* nf assumes rcu_read_lock, not just read_lock_bh */
+ rcu_read_lock();
ret = nf_hook_slow(skb, &state, e, 0);
+ rcu_read_unlock();
if (ret == 1) {
return skb;
--
2.34.1
next prev parent reply other threads:[~2022-03-09 16:26 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-09 16:16 [PATCH AUTOSEL 5.16 01/27] arm64: dts: rockchip: fix dma-controller node names on rk356x Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 02/27] arm64: dts: rockchip: fix rk3399-puma-haikou USB OTG mode Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 03/27] xfrm: Check if_id in xfrm_migrate Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 04/27] xfrm: Fix xfrm migrate issues when address family changes Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 05/27] arm64: dts: rockchip: fix rk3399-puma eMMC HS400 signal integrity Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 06/27] arm64: dts: rockchip: align pl330 node name with dtschema Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 07/27] arm64: dts: rockchip: reorder rk3399 hdmi clocks Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 08/27] arm64: dts: agilex: use the compatible "intel,socfpga-agilex-hsotg" Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 09/27] ARM: dts: rockchip: reorder rk322x hmdi clocks Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 10/27] ARM: dts: rockchip: fix a typo on rk3288 crypto-controller Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 11/27] mac80211: refuse aggregations sessions before authorized Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 12/27] MIPS: smp: fill in sibling and core maps earlier Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 13/27] ARM: 9178/1: fix unmet dependency on BITREVERSE for HAVE_ARCH_BITREVERSE Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 14/27] Bluetooth: hci_core: Fix leaking sent_cmd skb Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 15/27] can: rcar_canfd: rcar_canfd_channel_probe(): register the CAN device when fully ready Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 16/27] net: sparx5: Add #include to remove warning Sasha Levin
2022-03-09 16:49 ` Jakub Kicinski
2022-03-16 14:45 ` Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 17/27] atm: firestream: check the return value of ioremap() in fs_init() Sasha Levin
2022-03-09 16:48 ` Jakub Kicinski
2022-03-16 14:49 ` Sasha Levin
2022-03-09 16:16 ` Sasha Levin [this message]
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 19/27] Input: goodix - use the new soc_intel_is_byt() helper Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 20/27] Input: goodix - workaround Cherry Trail devices with a bogus ACPI Interrupt() resource Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 21/27] iwlwifi: don't advertise TWT support Sasha Levin
2022-03-09 16:16 ` [PATCH AUTOSEL 5.16 22/27] drm/vrr: Set VRR capable prop only if it is attached to connector Sasha Levin
2022-03-09 16:17 ` [PATCH AUTOSEL 5.16 23/27] nl80211: Update bss channel on channel switch for P2P_CLIENT Sasha Levin
2022-03-09 16:17 ` [PATCH AUTOSEL 5.16 24/27] tcp: make tcp_read_sock() more robust Sasha Levin
2022-03-09 16:17 ` [PATCH AUTOSEL 5.16 25/27] sfc: extend the locking on mcdi->seqno Sasha Levin
2022-03-09 16:17 ` [PATCH AUTOSEL 5.16 26/27] bnx2: Fix an error message Sasha Levin
2022-03-09 16:17 ` [PATCH AUTOSEL 5.16 27/27] kselftest/vm: fix tests build with old libc Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220309161711.135679-18-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=coreteam@netfilter.org \
--cc=eric.dumazet@gmail.com \
--cc=fw@strlen.de \
--cc=kadlec@netfilter.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox