cache: do not fetch set inconditionally on delete

This is only required to remove elements, relax cache requirements for
anything else.

Tested-by: Eric Garver <eric@garver.life>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/cache.c b/src/cache.c
index 1fc03f2bbe50998657fee9bb838e58302168178d..233147649263821594d124365ef6096987a1a85e 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -73,7 +73,8 @@ static unsigned int evaluate_cache_del(struct cmd *cmd, unsigned int flags)
 {
        switch (cmd->obj) {
        case CMD_OBJ_ELEMENTS:
-               flags |= NFT_CACHE_SETELEM_MAYBE;
+               flags |= NFT_CACHE_SET |
+                        NFT_CACHE_SETELEM_MAYBE;
                break;
        default:
                break;
@@ -426,8 +427,7 @@ int nft_cache_evaluate(struct nft_ctx *nft, struct list_head *cmds,
                        break;
                case CMD_DELETE:
                case CMD_DESTROY:
-                       flags |= NFT_CACHE_TABLE |
-                                NFT_CACHE_SET;
+                       flags |= NFT_CACHE_TABLE;
 
                        flags = evaluate_cache_del(cmd, flags);
                        break;

diff --git a/src/cmd.c b/src/cmd.c
index e64171e7c4dfcc4b419a307a64f7482fc1871a81..9a572b5660c73c29ab487383f4dd76d6c87c0336 100644 (file)
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -140,6 +140,10 @@ static int nft_cmd_enoent_set(struct netlink_ctx *ctx, const struct cmd *cmd,
        if (!cmd->handle.set.name)
                return 0;
 
+       if (nft_cache_update(ctx->nft, NFT_CACHE_TABLE | NFT_CACHE_SET,
+                            ctx->msgs, NULL) < 0)
+               return 0;
+
        set = set_lookup_fuzzy(cmd->handle.set.name, &ctx->nft->cache, &table);
        /* check table first. */
        if (!table)