diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-02-15 12:50:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-27 10:08:08 +0100 |
| commit | c92ba8820aca58e38dceeec554904307ac2e0851 (patch) | |
| tree | c4936bbb51ab0614b8f99bb0fb16354f5e89ece0 | |
| parent | 9ac5e6507acbe06a25de03ea9f3089c2f662a72f (diff) | |
| download | linux-c92ba8820aca58e38dceeec554904307ac2e0851.tar.gz linux-c92ba8820aca58e38dceeec554904307ac2e0851.tar.bz2 linux-c92ba8820aca58e38dceeec554904307ac2e0851.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>
| -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 bf26e27ca456..c445d57e3a5b 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -304,6 +304,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; |