]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
cache: release pending rules when chain binding lookup fails
authorPablo Neira Ayuso <pablo@netfilter.org>
Wed, 6 Jul 2022 11:21:34 +0000 (13:21 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 7 Jul 2022 06:29:20 +0000 (08:29 +0200)
If the implicit chain is not in the cache, release pending rules in
ctx->list and report EINTR to let the cache core retry to populate a
consistent cache.

Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1402
Fixes: c330152b7f77 ("src: support for implicit chain bindings")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
src/cache.c

index fd8df884c095adcea3964c0dd77b8eb7ac45cd92..b6ae2310b175f8b6076b2530c3654a4370cb1769 100644 (file)
@@ -847,12 +847,21 @@ static int rule_init_cache(struct netlink_ctx *ctx, struct table *table,
                        chain = chain_binding_lookup(table,
                                                     rule->handle.chain.name);
                if (!chain)
-                       return -1;
+                       goto err_ctx_list;
 
                list_move_tail(&rule->list, &chain->rules);
        }
 
        return ret;
+
+err_ctx_list:
+       list_for_each_entry_safe(rule, nrule, &ctx->list, list) {
+               list_del(&rule->list);
+               rule_free(rule);
+       }
+       errno = EINTR;
+
+       return -1;
 }
 
 static int implicit_chain_cache(struct netlink_ctx *ctx, struct table *table,