Skip to contentSkip to conversation

optimize: handle prefix and range when merging into set + concatenation

PATCH New Pablo Neira Ayuso 1 participant 1 message Nov 5, 2022

Subsystems (2)
lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 1/1 optimize: handle prefix and range when merging into set + concatenation

The following ruleset fails to be merged using set + concatenation:

meta iifname eth1 ip saddr 1.1.1.2 ip daddr 2.2.3.0/24 accept meta iifname eth1 ip saddr 1.1.1.2 ip daddr 2.2.4.0-2.2.4.10 accept

hitting the following assertion:

nft: optimize.c:585: __merge_concat_stmts: Assertion `0' failed. Abort

This patch also updates tests/shell.

---
 src/optimize.c                                                  | 2 ++
 .../shell/testcases/optimizations/dumps/merge_stmts_concat.nft  | 2 +-
 tests/shell/testcases/optimizations/merge_stmts_concat          | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)
src/optimize.c +2 -0
index 180a7d55f18b..09013efc548c 100644
@@ -578,6 +578,8 @@ static void __merge_concat_stmts(const struct optimize_ctx *ctx, uint32_t i,
 				break;
 			case EXPR_SYMBOL:
 			case EXPR_VALUE:
+			case EXPR_PREFIX:
+			case EXPR_RANGE:
 				clone = expr_clone(stmt_a->expr->right);
 				compound_expr_add(concat, clone);
 				break;
tests/shell/testcases/optimizations/dumps/merge_stmts_concat.nft +1 -1
index 5d03cf8d9566..f56cea1c4fd7 100644
@@ -1,6 +1,6 @@
 table ip x {
 	chain y {
-		iifname . ip saddr . ip daddr { "eth1" . 1.1.1.1 . 2.2.2.3, "eth1" . 1.1.1.2 . 2.2.2.4, "eth2" . 1.1.1.3 . 2.2.2.5 } accept
+		iifname . ip saddr . ip daddr { "eth1" . 1.1.1.1 . 2.2.2.3, "eth1" . 1.1.1.2 . 2.2.2.4, "eth1" . 1.1.1.2 . 2.2.3.0/24, "eth1" . 1.1.1.2 . 2.2.4.0-2.2.4.10, "eth2" . 1.1.1.3 . 2.2.2.5 } accept
 		ip protocol . th dport { tcp . 22, udp . 67 }
 	}
 
tests/shell/testcases/optimizations/merge_stmts_concat +2 -0
index 0bcd95622a98..9679d86223fd 100755
@@ -6,6 +6,8 @@ RULESET="table ip x {
 	chain y {
 		meta iifname eth1 ip saddr 1.1.1.1 ip daddr 2.2.2.3 accept
 		meta iifname eth1 ip saddr 1.1.1.2 ip daddr 2.2.2.4 accept
+		meta iifname eth1 ip saddr 1.1.1.2 ip daddr 2.2.3.0/24 accept
+		meta iifname eth1 ip saddr 1.1.1.2 ip daddr 2.2.4.0-2.2.4.10 accept
 		meta iifname eth2 ip saddr 1.1.1.3 ip daddr 2.2.2.5 accept
 		ip protocol . th dport { tcp . 22, udp . 67 }
 	}
Signature · 1 line
2.30.2