Skip to content

Commit b9f052d

Browse files
author
Florian Westphal
committed
netfilter: nf_tables: fix false-positive lockdep splat
->abort invocation may cause splat on debug kernels: WARNING: suspicious RCU usage net/netfilter/nft_set_pipapo.c:1697 suspicious rcu_dereference_check() usage! [..] rcu_scheduler_active = 2, debug_locks = 1 1 lock held by nft/133554: [..] (nft_net->commit_mutex){+.+.}-{3:3}, at: nf_tables_valid_genid [..] lockdep_rcu_suspicious+0x1ad/0x260 nft_pipapo_abort+0x145/0x180 __nf_tables_abort+0x5359/0x63d0 nf_tables_abort+0x24/0x40 nfnetlink_rcv+0x1a0a/0x22c0 netlink_unicast+0x73c/0x900 netlink_sendmsg+0x7f0/0xc20 ____sys_sendmsg+0x48d/0x760 Transaction mutex is held, so parallel updates are not possible. Switch to _protected and check mutex is held for lockdep enabled builds. Fixes: 212ed75 ("netfilter: nf_tables: integrate pipapo into commit protocol") Signed-off-by: Florian Westphal <fw@strlen.de>
1 parent e4dd0d3 commit b9f052d

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

net/netfilter/nft_set_pipapo.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1697,6 +1697,17 @@ static void nft_pipapo_commit(const struct nft_set *set)
16971697
priv->clone = new_clone;
16981698
}
16991699

1700+
static bool nft_pipapo_transaction_mutex_held(const struct nft_set *set)
1701+
{
1702+
#ifdef CONFIG_PROVE_LOCKING
1703+
const struct net *net = read_pnet(&set->net);
1704+
1705+
return lockdep_is_held(&nft_pernet(net)->commit_mutex);
1706+
#else
1707+
return true;
1708+
#endif
1709+
}
1710+
17001711
static void nft_pipapo_abort(const struct nft_set *set)
17011712
{
17021713
struct nft_pipapo *priv = nft_set_priv(set);
@@ -1705,7 +1716,7 @@ static void nft_pipapo_abort(const struct nft_set *set)
17051716
if (!priv->dirty)
17061717
return;
17071718

1708-
m = rcu_dereference(priv->match);
1719+
m = rcu_dereference_protected(priv->match, nft_pipapo_transaction_mutex_held(set));
17091720

17101721
new_clone = pipapo_clone(m);
17111722
if (IS_ERR(new_clone))

0 commit comments

Comments
 (0)