70 lines
2.2 KiB
Diff
70 lines
2.2 KiB
Diff
From 1d03ab5267bdbc7c0bcb041efaad42a462fdeb5f Mon Sep 17 00:00:00 2001
|
|
From: Florian Westphal <fw@strlen.de>
|
|
Date: Thu, 11 Jan 2024 18:14:15 +0100
|
|
Subject: [PATCH] evaluate: tproxy: move range error checks after arg
|
|
evaluation
|
|
|
|
Testing for range before evaluation will still crash us later during
|
|
netlink linearization, prefixes turn into ranges, symbolic expression
|
|
might hide a range/prefix.
|
|
|
|
So move this after the argument has been evaluated.
|
|
|
|
Signed-off-by: Florian Westphal <fw@strlen.de>
|
|
---
|
|
src/evaluate.c | 12 ++++++------
|
|
tests/shell/testcases/bogons/nft-f/tproxy_ranges | 8 ++++++++
|
|
2 files changed, 14 insertions(+), 6 deletions(-)
|
|
create mode 100644 tests/shell/testcases/bogons/nft-f/tproxy_ranges
|
|
|
|
diff --git a/src/evaluate.c b/src/evaluate.c
|
|
index 197c82c2..d11bed01 100644
|
|
--- a/src/evaluate.c
|
|
+++ b/src/evaluate.c
|
|
@@ -4132,22 +4132,22 @@ static int stmt_evaluate_tproxy(struct eval_ctx *ctx, struct stmt *stmt)
|
|
return err;
|
|
|
|
if (stmt->tproxy.addr != NULL) {
|
|
- if (stmt->tproxy.addr->etype == EXPR_RANGE)
|
|
- return stmt_error(ctx, stmt, "Address ranges are not supported for tproxy.");
|
|
-
|
|
err = stmt_evaluate_addr(ctx, stmt, &stmt->tproxy.family,
|
|
&stmt->tproxy.addr);
|
|
-
|
|
if (err < 0)
|
|
return err;
|
|
+
|
|
+ if (stmt->tproxy.addr->etype == EXPR_RANGE)
|
|
+ return stmt_error(ctx, stmt, "Address ranges are not supported for tproxy.");
|
|
}
|
|
|
|
if (stmt->tproxy.port != NULL) {
|
|
- if (stmt->tproxy.port->etype == EXPR_RANGE)
|
|
- return stmt_error(ctx, stmt, "Port ranges are not supported for tproxy.");
|
|
err = nat_evaluate_transport(ctx, stmt, &stmt->tproxy.port);
|
|
if (err < 0)
|
|
return err;
|
|
+
|
|
+ if (stmt->tproxy.port->etype == EXPR_RANGE)
|
|
+ return stmt_error(ctx, stmt, "Port ranges are not supported for tproxy.");
|
|
}
|
|
|
|
return 0;
|
|
diff --git a/tests/shell/testcases/bogons/nft-f/tproxy_ranges b/tests/shell/testcases/bogons/nft-f/tproxy_ranges
|
|
new file mode 100644
|
|
index 00000000..1230860e
|
|
--- /dev/null
|
|
+++ b/tests/shell/testcases/bogons/nft-f/tproxy_ranges
|
|
@@ -0,0 +1,8 @@
|
|
+define range = 42-80
|
|
+
|
|
+table t {
|
|
+ chain c {
|
|
+ tcp dport 42 tproxy to 192.168.0.1:$range
|
|
+ tcp dport 42 tproxy to 192.168.0.0/16
|
|
+ }
|
|
+}
|
|
--
|
|
2.33.0
|
|
|