Commit 7e7a817f authored by Florian Westphal's avatar Florian Westphal
Browse files

netfilter: nf_tables: avoid softlockup warnings in nft_chain_validate 



This reverts commit
314c8284 ("netfilter: nf_tables: can't schedule in nft_chain_validate"):
Since commit a60a5abe ("netfilter: nf_tables: allow iter callbacks to sleep")
the iterator callback is invoked without rcu read lock held, so this
cond_resched() is now valid.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
parent 8e1a1bc4

net/netfilter/nf_tables_api.c

+2 −2
Original line number Diff line number Diff line
@@ -4171,6 +4171,8 @@ int nft_chain_validate(const struct nft_ctx *ctx, struct nft_chain *chain) 
			if (err < 0)

				return err;

		}



		cond_resched();

	}



	nft_chain_vstate_update(ctx, chain);
@@ -4195,8 +4197,6 @@ static int nft_table_validate(struct net *net, const struct nft_table *table) 
		err = nft_chain_validate(&ctx, chain);

		if (err < 0)

			goto err;



		cond_resched();

	}



err: