cache: populate objects on demand from error path

Objects are only required for error reporting hints if kernel reports
ENOENT. Populate the cache from this error path only.

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 36c6f12d8720006d9598494a663724ae4b4b6c31..6ad8e25878060811e1b0d92b49a0d8ebb7b6ea8b 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -31,7 +31,6 @@ static unsigned int evaluate_cache_add(struct cmd *cmd, unsigned int flags)
 
                flags |= NFT_CACHE_TABLE |
                         NFT_CACHE_SET |
-                        NFT_CACHE_OBJECT |
                         NFT_CACHE_FLOWTABLE;
                list_for_each_entry(set, &cmd->table->sets, list) {
                        if (set->automerge)
@@ -54,13 +53,11 @@ static unsigned int evaluate_cache_add(struct cmd *cmd, unsigned int flags)
        case CMD_OBJ_ELEMENTS:
                flags |= NFT_CACHE_TABLE |
                         NFT_CACHE_SET |
-                        NFT_CACHE_OBJECT |
                         NFT_CACHE_SETELEM_MAYBE;
                break;
        case CMD_OBJ_RULE:
                flags |= NFT_CACHE_TABLE |
                         NFT_CACHE_SET |
-                        NFT_CACHE_OBJECT |
                         NFT_CACHE_FLOWTABLE;
 
                if (cmd->handle.index.id ||
@@ -433,8 +430,7 @@ int nft_cache_evaluate(struct nft_ctx *nft, struct list_head *cmds,
                case CMD_DESTROY:
                        flags |= NFT_CACHE_TABLE |
                                 NFT_CACHE_SET |
-                                NFT_CACHE_FLOWTABLE |
-                                NFT_CACHE_OBJECT;
+                                NFT_CACHE_FLOWTABLE;
 
                        flags = evaluate_cache_del(cmd, flags);
                        break;

diff --git a/src/cmd.c b/src/cmd.c
index 381f404266de962b684041e15e205c02c6106273..507796bdd6a8d23066f89304afd6a8ad099aa157 100644 (file)
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -169,6 +169,10 @@ static int nft_cmd_enoent_obj(struct netlink_ctx *ctx, const struct cmd *cmd,
        if (!cmd->handle.obj.name)
                return 0;
 
+       if (nft_cache_update(ctx->nft, NFT_CACHE_TABLE | NFT_CACHE_OBJECT,
+                            ctx->msgs, NULL) < 0)
+               return 0;
+
        obj = obj_lookup_fuzzy(cmd->handle.obj.name, &ctx->nft->cache, &table);
        /* check table first. */
        if (!table)