diff options
| author | Pablo Neira Ayuso | 2019-02-15 12:50:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-02-27 10:09:02 +0100 |
| commit | 1500d94e33d88383c69c27d6c9247174898a4078 (patch) | |
| tree | d100d34347d8d84b553a3979a68fba684707120b /net/netfilter | |
| parent | Revert "bridge: do not add port to router list when receives query with sourc... (diff) | |
| download | kernel-qcow2-linux-1500d94e33d88383c69c27d6c9247174898a4078.tar.gz kernel-qcow2-linux-1500d94e33d88383c69c27d6c9247174898a4078.tar.xz kernel-qcow2-linux-1500d94e33d88383c69c27d6c9247174898a4078.zip | |
netfilter: nf_tables: fix flush after rule deletion in the same batch
commit 23b7ca4f745f21c2b9cfcb67fdd33733b3ae7e66 upstream.
Flush after rule deletion bogusly hits -ENOENT. Skip rules that have
been already from nft_delrule_by_chain() which is always called from the
flush path.
Fixes: cf9dc09d0949 ("netfilter: nf_tables: fix missing rules flushing per table")
Reported-by: Phil Sutter <phil@nwl.cc>
Acked-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nf_tables_api.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 38654730230b..7d424fd27025 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -291,6 +291,9 @@ static int nft_delrule_by_chain(struct nft_ctx *ctx) int err; list_for_each_entry(rule, &ctx->chain->rules, list) { + if (!nft_is_active_next(ctx->net, rule)) + continue; + err = nft_delrule(ctx, rule); if (err < 0) return err; |