optimize: incorrect logic in verdict comparison
Pablo Neira Ayuso
maintainerPATCH 1/3 optimize: incorrect logic in verdict comparison
Keep inspecting rule verdicts before assuming they are equal. Update existing test to catch this bug.
Fixes 1542082e259b ("optimize: merge same selector with different verdict into verdict map")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/optimize.c | 10 +++++----- .../testcases/optimizations/merge_stmts_concat_vmap | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
src/optimize.c +5 -5
@@ -621,13 +621,13 @@ static bool stmt_verdict_cmp(const struct optimize_ctx *ctx,for (i = from; i +1 <= to; i++) { stmt_a = ctx->stmt_matrix[i][k]; stmt_b = ctx->stmt_matrix[i +1 ][k]; -if (!stmt_a && !stmt_b) -return true; -if (stmt_verdict_eq (stmt_a, stmt_b)) -return true; +if (!stmt_a || !stmt_b) +return false; +if (!stmt_verdict_eq (stmt_a, stmt_b)) +return false; } -return false; +return true; } static void rule_optimize_print(struct output_ctx *octx,
tests/shell/testcases/optimizations/merge_stmts_concat_vmap +1 -1
@@ -5,8 +5,8 @@ set -e RULESET="table ip x { chain y { ip saddr 1.1.1.1 ip daddr 2.2.2.2 accept - ip saddr 2.2.2.2 ip daddr 3.3.3.3 drop ip saddr 4.4.4.4 ip daddr 5.5.5.5 accept + ip saddr 2.2.2.2 ip daddr 3.3.3.3 drop } }"
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/3 optimize: do not clone unsupported statement
Skip unsupported statements when building the statement matrix, otherwise clone remains uninitialized.
Fixes fb298877ece2 ("src: add ruleset optimization infrastructure")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/optimize.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/optimize.c +1 -1
@@ -274,7 +274,7 @@ static int rule_collect_stmts(struct optimize_ctx *ctx, struct rule *rule) clone->log.prefix =expr_get (stmt->log.prefix);break ;default : -break ; +continue ; } ctx->stmt[ctx->num_stmts++] = clone;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 3/3 optimize: merge nat rules with same selectors into map
In reply to Pablo Neira AyusoVerdict and nat are mutually exclusive, no need to support for this combination.
# cat ruleset.nft
table ip x {
chain y {
type nat hook postrouting priority srcnat; policy drop;
ip saddr 1.1.1.1 tcp dport 8000 snat to 4.4.4.4:80
ip saddr 2.2.2.2 tcp dport 8001 snat to 5.5.5.5:90
}
} # nft -o -c -f ruleset.nft
Merging:
ruleset.nft:4:3-52: ip saddr 1.1.1.1 tcp dport 8000 snat to 4.4.4.4:80
ruleset.nft:5:3-52: ip saddr 2.2.2.2 tcp dport 8001 snat to 5.5.5.5:90
into:
snat to ip saddr . tcp dport map { 1.1.1.1 . 8000 : 4.4.4.4 . 80, 2.2.2.2 . 8001 : 5.5.5.5 . 90 }Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/optimize.c | 200 +++++++++++++++++- .../optimizations/dumps/merge_nat.nft | 20 ++ tests/shell/testcases/optimizations/merge_nat | 39 ++++ 3 files changed, 249 insertions(+), 10 deletions(-) create mode 100644 tests/shell/testcases/optimizations/dumps/merge_nat.nft create mode 100755 tests/shell/testcases/optimizations/merge_nat
src/optimize.c +190 -10
@@ -173,6 +173,22 @@ static bool __stmt_type_eq(const struct stmt *stmt_a, const struct stmt *stmt_b) stmt_a->reject.icmp_code != stmt_b->reject.icmp_code)return false;break ; +case STMT_NAT : +if (stmt_a->nat.type != stmt_b->nat.type || + stmt_a->nat.flags != stmt_b->nat.flags || + stmt_a->nat.family != stmt_b->nat.family || + stmt_a->nat.type_flags != stmt_b->nat.type_flags || + (stmt_a->nat.addr && + stmt_a->nat.addr->etype !=EXPR_SYMBOL ) || + (stmt_b->nat.addr && + stmt_b->nat.addr->etype !=EXPR_SYMBOL ) || + (stmt_a->nat.proto && + stmt_a->nat.proto->etype !=EXPR_SYMBOL ) || + (stmt_b->nat.proto && + stmt_b->nat.proto->etype !=EXPR_SYMBOL )) +return false; + +return true;default :/* ... Merging anything else is yet unsupported. */ return false;
@@ -273,6 +289,16 @@ static int rule_collect_stmts(struct optimize_ctx *ctx, struct rule *rule)if (stmt->log.prefix) clone->log.prefix =expr_get (stmt->log.prefix);break ; +case STMT_NAT : + clone->nat.type = stmt->nat.type; + clone->nat.family = stmt->nat.family; +if (stmt->nat.addr) + clone->nat.addr =expr_clone (stmt->nat.addr); +if (stmt->nat.proto) + clone->nat.proto =expr_clone (stmt->nat.proto); + clone->nat.flags = stmt->nat.flags; + clone->nat.type_flags = stmt->nat.type_flags; +break ;default :continue ; }
@@ -630,6 +656,129 @@ static bool stmt_verdict_cmp(const struct optimize_ctx *ctx,return true; } +static int stmt_nat_find (const struct optimize_ctx *ctx) +{ +uint32_t i; + +for (i =0 ; i < ctx->num_stmts; i++) { +if (ctx->stmt[i]->ops->type !=STMT_NAT ) +continue ; + +return i; + } + +return -1 ; +} + +static struct expr *stmt_nat_expr (struct stmt *nat_stmt) +{ +struct expr *nat_expr; + +if (nat_stmt->nat.proto) { + nat_expr =concat_expr_alloc (&internal_location); +compound_expr_add (nat_expr,expr_get (nat_stmt->nat.addr)); +compound_expr_add (nat_expr,expr_get (nat_stmt->nat.proto)); +expr_free (nat_stmt->nat.proto); + nat_stmt->nat.proto =NULL ; + }else { + nat_expr =expr_get (nat_stmt->nat.addr); + } + +return nat_expr; +} + +static void merge_nat (const struct optimize_ctx *ctx, +uint32_t from,uint32_t to, +const struct merge *merge) +{ +struct expr *expr, *set, *elem, *nat_expr, *mapping, *left; +struct stmt *stmt, *nat_stmt; +uint32_t i; +int k; + + k =stmt_nat_find (ctx); +assert (k >=0 ); + + set =set_expr_alloc (&internal_location,NULL ); + set->set_flags |=NFT_SET_ANONYMOUS ; + +for (i = from; i <= to; i++) { + stmt = ctx->stmt_matrix[i][merge->stmt[0 ]]; + expr = stmt->expr->right; + + nat_stmt = ctx->stmt_matrix[i][k]; + nat_expr =stmt_nat_expr (nat_stmt); + + elem =set_elem_expr_alloc (&internal_location,expr_get (expr)); + mapping =mapping_expr_alloc (&internal_location, elem, nat_expr); +compound_expr_add (set, mapping); + } + + stmt = ctx->stmt_matrix[from][merge->stmt[0 ]]; + left =expr_get (stmt->expr->left); + expr =map_expr_alloc (&internal_location, left, set); + + nat_stmt = ctx->stmt_matrix[from][k]; +expr_free (nat_stmt->nat.addr); + nat_stmt->nat.addr = expr; + +remove_counter (ctx, from); +list_del (&stmt->list); +stmt_free (stmt); +} + +static void merge_concat_nat (const struct optimize_ctx *ctx, +uint32_t from,uint32_t to, +const struct merge *merge) +{ +struct expr *expr, *set, *elem, *nat_expr, *mapping, *left, *concat; +struct stmt *stmt, *nat_stmt; +uint32_t i, j; +int k; + + k =stmt_nat_find (ctx); +assert (k >=0 ); + + set =set_expr_alloc (&internal_location,NULL ); + set->set_flags |=NFT_SET_ANONYMOUS ; + +for (i = from; i <= to; i++) { + + concat =concat_expr_alloc (&internal_location); +for (j =0 ; j < merge->num_stmts; j++) { + stmt = ctx->stmt_matrix[i][merge->stmt[j]]; + expr = stmt->expr->right; +compound_expr_add (concat,expr_get (expr)); + } + + nat_stmt = ctx->stmt_matrix[i][k]; + nat_expr =stmt_nat_expr (nat_stmt); + + elem =set_elem_expr_alloc (&internal_location, concat); + mapping =mapping_expr_alloc (&internal_location, elem, nat_expr); +compound_expr_add (set, mapping); + } + + concat =concat_expr_alloc (&internal_location); +for (j =0 ; j < merge->num_stmts; j++) { + stmt = ctx->stmt_matrix[from][merge->stmt[j]]; + left = stmt->expr->left; +compound_expr_add (concat,expr_get (left)); + } + expr =map_expr_alloc (&internal_location, concat, set); + + nat_stmt = ctx->stmt_matrix[from][k]; +expr_free (nat_stmt->nat.addr); + nat_stmt->nat.addr = expr; + +remove_counter (ctx, from); +for (j =0 ; j < merge->num_stmts; j++) { + stmt = ctx->stmt_matrix[from][merge->stmt[j]]; +list_del (&stmt->list); +stmt_free (stmt); + } +} +static void rule_optimize_print (struct output_ctx *octx,const struct rule *rule) {
@@ -663,26 +812,57 @@ static void rule_optimize_print(struct output_ctx *octx,fprintf (octx->error_fp,"%s\n" , line); } +static enum stmt_types merge_stmt_type (const struct optimize_ctx *ctx) +{ +uint32_t i; + +for (i =0 ; i < ctx->num_stmts; i++) { +switch (ctx->stmt[i]->ops->type) { +case STMT_VERDICT : +case STMT_NAT : +return ctx->stmt[i]->ops->type; +default : +continue ; + } + } + +return STMT_INVALID ; +} +static void merge_rules (const struct optimize_ctx *ctx,uint32_t from,uint32_t to,const struct merge *merge,struct output_ctx *octx) { +enum stmt_types stmt_type;bool same_verdict;uint32_t i; - same_verdict =stmt_verdict_cmp (ctx, from, to); + stmt_type =merge_stmt_type (ctx); -if (merge->num_stmts >1 ) { -if (same_verdict) -merge_concat_stmts (ctx, from, to, merge); -else -merge_concat_stmts_vmap (ctx, from, to, merge); - }else { -if (same_verdict) -merge_stmts (ctx, from, to, merge); +switch (stmt_type) { +case STMT_VERDICT : + same_verdict =stmt_verdict_cmp (ctx, from, to); +if (merge->num_stmts >1 ) { +if (same_verdict) +merge_concat_stmts (ctx, from, to, merge); +else +merge_concat_stmts_vmap (ctx, from, to, merge); + }else { +if (same_verdict) +merge_stmts (ctx, from, to, merge); +else +merge_stmts_vmap (ctx, from, to, merge); + } +break ; +case STMT_NAT : +if (merge->num_stmts >1 ) +merge_concat_nat (ctx, from, to, merge);else -merge_stmts_vmap (ctx, from, to, merge); +merge_nat (ctx, from, to, merge); +break ; +default : +assert (0 ); }fprintf (octx->error_fp,"Merging:\n" );
tests/shell/testcases/optimizations/dumps/merge_nat.nft new file +20 -0
@@ -0,0 +1,20 @@ +table ip test1 { + chain y { + dnat to ip saddr map { 4.4.4.4 : 1.1.1.1, 5.5.5.5 : 2.2.2.2 } + } +} +table ip test2 { + chain y { + dnat ip to tcp dport map { 80 : 1.1.1.1 . 8001, 81 : 2.2.2.2 . 9001 } + } +} +table ip test3 { + chain y { + snat to ip saddr . tcp sport map { 1.1.1.1 . 1024-65535 : 3.3.3.3, 2.2.2.2 . 1024-65535 : 4.4.4.4 } + } +} +table ip test4 { + chain y { + dnat ip to ip daddr . tcp dport map { 1.1.1.1 . 80 : 4.4.4.4 . 8000, 2.2.2.2 . 81 : 3.3.3.3 . 9000 } + } +}
tests/shell/testcases/optimizations/merge_nat new file +39 -0
@@ -0,0 +1,39 @@ +#!/bin/bash + +set -e + +RULESET="table ip test1 { + chain y { + ip saddr 4.4.4.4 dnat to 1.1.1.1 + ip saddr 5.5.5.5 dnat to 2.2.2.2 + } +}" + +$NFT -o -f - <<< $RULESET + +RULESET="table ip test2 { + chain y { + tcp dport 80 dnat to 1.1.1.1:8001 + tcp dport 81 dnat to 2.2.2.2:9001 + } +}" + +$NFT -o -f - <<< $RULESET + +RULESET="table ip test3 { + chain y { + ip saddr 1.1.1.1 tcp sport 1024-65535 snat to 3.3.3.3 + ip saddr 2.2.2.2 tcp sport 1024-65535 snat to 4.4.4.4 + } +}" + +$NFT -o -f - <<< $RULESET + +RULESET="table ip test4 { + chain y { + ip daddr 1.1.1.1 tcp dport 80 dnat to 4.4.4.4:8000 + ip daddr 2.2.2.2 tcp dport 81 dnat to 3.3.3.3:9000 + } +}" + +$NFT -o -f - <<< $RULESET
Signature · 1 line
2.30.2