netfilter: nf_tables: set backend .flush always succeeds

.flush is always successful since this results from iterating over the
set elements to toggle mark the element as inactive in the next
generation.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 8de040d2d2cf855bfd855ab550fa5809a0eadde6..d0f5c477c254ca7d236772a8f5b003dd05797174 100644 (file)
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -449,7 +449,7 @@ struct nft_set_ops {
        void *                          (*deactivate)(const struct net *net,
                                                      const struct nft_set *set,
                                                      const struct nft_set_elem *elem);
-       bool                            (*flush)(const struct net *net,
+       void                            (*flush)(const struct net *net,
                                                 const struct nft_set *set,
                                                 void *priv);
        void                            (*remove)(const struct net *net,

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index ecb251f6c6a61bc1bf8e45c946811fdb458adf92..35db40857bc666450e2e032a54fad46dd8cc17b8 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -7146,17 +7146,13 @@ static int nft_setelem_flush(const struct nft_ctx *ctx,
                             struct nft_set_elem *elem)
 {
        struct nft_trans *trans;
-       int err;
 
        trans = nft_trans_alloc_gfp(ctx, NFT_MSG_DELSETELEM,
                                    sizeof(struct nft_trans_elem), GFP_ATOMIC);
        if (!trans)
                return -ENOMEM;
 
-       if (!set->ops->flush(ctx->net, set, elem->priv)) {
-               err = -ENOENT;
-               goto err1;
-       }
+       set->ops->flush(ctx->net, set, elem->priv);
        set->ndeact++;
 
        nft_setelem_data_deactivate(ctx->net, set, elem);
@@ -7165,9 +7161,6 @@ static int nft_setelem_flush(const struct nft_ctx *ctx,
        nft_trans_commit_list_add_tail(ctx->net, trans);
 
        return 0;
-err1:
-       kfree(trans);
-       return err;
 }
 
 static int __nft_set_catchall_flush(const struct nft_ctx *ctx,

diff --git a/net/netfilter/nft_set_bitmap.c b/net/netfilter/nft_set_bitmap.c
index 1e5e7a181e0bc20f1603d49e5aa747fb981978e5..2ee6e3672b4155679b609f39ce31bfbe242656a2 100644 (file)
--- a/net/netfilter/nft_set_bitmap.c
+++ b/net/netfilter/nft_set_bitmap.c
@@ -174,7 +174,7 @@ static void nft_bitmap_activate(const struct net *net,
        nft_set_elem_change_active(net, set, &be->ext);
 }
 
-static bool nft_bitmap_flush(const struct net *net,
+static void nft_bitmap_flush(const struct net *net,
                             const struct nft_set *set, void *_be)
 {
        struct nft_bitmap *priv = nft_set_priv(set);
@@ -186,8 +186,6 @@ static bool nft_bitmap_flush(const struct net *net,
        /* Enter 10 state, similar to deactivation. */
        priv->bitmap[idx] &= ~(genmask << off);
        nft_set_elem_change_active(net, set, &be->ext);
-
-       return true;
 }
 
 static void *nft_bitmap_deactivate(const struct net *net,

diff --git a/net/netfilter/nft_set_hash.c b/net/netfilter/nft_set_hash.c
index 2013de934cef096ac8fa512c1cd4bc18c7c52c10..e758b887ad8639f140afe63aa35f278c7e01a319 100644 (file)
--- a/net/netfilter/nft_set_hash.c
+++ b/net/netfilter/nft_set_hash.c
@@ -192,14 +192,12 @@ static void nft_rhash_activate(const struct net *net, const struct nft_set *set,
        nft_set_elem_change_active(net, set, &he->ext);
 }
 
-static bool nft_rhash_flush(const struct net *net,
+static void nft_rhash_flush(const struct net *net,
                            const struct nft_set *set, void *priv)
 {
        struct nft_rhash_elem *he = priv;
 
        nft_set_elem_change_active(net, set, &he->ext);
-
-       return true;
 }
 
 static void *nft_rhash_deactivate(const struct net *net,
@@ -590,13 +588,12 @@ static void nft_hash_activate(const struct net *net, const struct nft_set *set,
        nft_set_elem_change_active(net, set, &he->ext);
 }
 
-static bool nft_hash_flush(const struct net *net,
+static void nft_hash_flush(const struct net *net,
                           const struct nft_set *set, void *priv)
 {
        struct nft_hash_elem *he = priv;
 
        nft_set_elem_change_active(net, set, &he->ext);
-       return true;
 }
 
 static void *nft_hash_deactivate(const struct net *net,

diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c
index bea63aa2df4b179bced9a520f29880c3df315f56..dba073aa9ad64232d37240e87557dbea0fb5dfbf 100644 (file)
--- a/net/netfilter/nft_set_pipapo.c
+++ b/net/netfilter/nft_set_pipapo.c
@@ -1809,14 +1809,12 @@ static void *nft_pipapo_deactivate(const struct net *net,
  *
  * Return: true if element was found and deactivated.
  */
-static bool nft_pipapo_flush(const struct net *net, const struct nft_set *set,
+static void nft_pipapo_flush(const struct net *net, const struct nft_set *set,
                             void *elem)
 {
        struct nft_pipapo_elem *e = elem;
 
        nft_set_elem_change_active(net, set, &e->ext);
-
-       return true;
 }
 
 /**

diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c
index 7d1004f9e7d25855f2b88040772afa18713298fa..60ff591eb265b292fbcd7bac5f43476acf8ddf25 100644 (file)
--- a/net/netfilter/nft_set_rbtree.c
+++ b/net/netfilter/nft_set_rbtree.c
@@ -535,14 +535,12 @@ static void nft_rbtree_activate(const struct net *net,
        nft_set_elem_change_active(net, set, &rbe->ext);
 }
 
-static bool nft_rbtree_flush(const struct net *net,
+static void nft_rbtree_flush(const struct net *net,
                             const struct nft_set *set, void *priv)
 {
        struct nft_rbtree_elem *rbe = priv;
 
        nft_set_elem_change_active(net, set, &rbe->ext);
-
-       return true;
 }
 
 static void *nft_rbtree_deactivate(const struct net *net,