rule: fix object ordering via nft -f
Pablo Neira Ayuso
maintainerPATCH 1/1 rule: fix object ordering via nft -f
The objects need to be loaded in the following ordering:
#1 tables #2 chains #3 sets #4 rules
We have to make sure that chains are in place by when we add rules with jumps/gotos. Similarly, we have to make sure that the sets are in place by when rules reference them.
Without this patch, you may hit ENOENT errors depending on your ruleset configuration.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/rule.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
src/rule.c +7 -2
@@ -658,14 +658,19 @@ static int do_add_table(struct netlink_ctx *ctx, const struct handle *h,if (netlink_add_table (ctx, h, loc, table, excl) <0 )return -1 ;if (table !=NULL ) { +list_for_each_entry (chain, &table->chains, list) { +if (netlink_add_chain (ctx, &chain->handle, + &chain->location, chain, + excl) <0 ) +return -1 ; + }list_for_each_entry (set, &table->sets, list) {handle_merge (&set->handle, &table->handle);if (do_add_set (ctx, &set->handle, set) <0 )return -1 ; }list_for_each_entry (chain, &table->chains, list) { -if (do_add_chain (ctx, &chain->handle, &chain->location, - chain, excl) <0 ) +if (netlink_add_rule_list (ctx, h, &chain->rules) <0 )return -1 ; } }
Signature · 1 line
1.7.10.4