Skip to content

Commit 83ed36f

Browse files
committed
netfilter: nf_tables: can't schedule in nft_chain_validate
jira VULN-429 subsystem-sync netfilter:nf_tables 4.18.0-511 commit-author Florian Westphal <[email protected]> commit 314c828 Can be called via nft set element list iteration, which may acquire rcu and/or bh read lock (depends on set type). BUG: sleeping function called from invalid context at net/netfilter/nf_tables_api.c:3353 in_atomic(): 0, irqs_disabled(): 0, non_block: 0, pid: 1232, name: nft preempt_count: 0, expected: 0 RCU nest depth: 1, expected: 0 2 locks held by nft/1232: #0: ffff8881180e3ea8 (&nft_net->commit_mutex){+.+.}-{3:3}, at: nf_tables_valid_genid #1: ffffffff83f5f540 (rcu_read_lock){....}-{1:2}, at: rcu_lock_acquire Call Trace: nft_chain_validate nft_lookup_validate_setelem nft_pipapo_walk nft_lookup_validate nft_chain_validate nft_immediate_validate nft_chain_validate nf_tables_validate nf_tables_abort No choice but to move it to nf_tables_validate(). Fixes: 81ea010 ("netfilter: nf_tables: add rescheduling points during loop detection walks") Signed-off-by: Florian Westphal <[email protected]> (cherry picked from commit 314c828) Signed-off-by: Jonathan Maple <[email protected]>
1 parent 1eef334 commit 83ed36f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/netfilter/nf_tables_api.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3041,8 +3041,6 @@ int nft_chain_validate(const struct nft_ctx *ctx, const struct nft_chain *chain)
30413041
if (err < 0)
30423042
return err;
30433043
}
3044-
3045-
cond_resched();
30463044
}
30473045

30483046
return 0;
@@ -3066,6 +3064,8 @@ static int nft_table_validate(struct net *net, const struct nft_table *table)
30663064
err = nft_chain_validate(&ctx, chain);
30673065
if (err < 0)
30683066
return err;
3067+
3068+
cond_resched();
30693069
}
30703070

30713071
return 0;

0 commit comments

Comments
 (0)