|
 |
ad45ff |
From d8f1860f72840104bff3742f477c572b57a9c3c1 Mon Sep 17 00:00:00 2001
|
|
|
ad45ff |
From: Phil Sutter <psutter@redhat.com>
|
|
|
ad45ff |
Date: Wed, 20 Jun 2018 09:38:55 +0200
|
|
|
ad45ff |
Subject: [PATCH] evaluate: explicitly deny concatenated types in interval sets
|
|
|
ad45ff |
|
|
|
ad45ff |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1576426
|
|
|
ad45ff |
Upstream Status: nftables commit 9a3d80172a61e
|
|
|
ad45ff |
|
|
|
ad45ff |
commit 9a3d80172a61e89c2862bcf41cb58313c236b308
|
|
|
ad45ff |
Author: Phil Sutter <phil@nwl.cc>
|
|
|
ad45ff |
Date: Wed Jun 6 13:21:49 2018 +0200
|
|
|
ad45ff |
|
|
|
ad45ff |
evaluate: explicitly deny concatenated types in interval sets
|
|
|
ad45ff |
|
|
|
ad45ff |
Previously, this triggered a program abort:
|
|
|
ad45ff |
|
|
|
ad45ff |
| # nft add table ip t
|
|
|
ad45ff |
| # nft add set ip t my_set '{ type ipv4_addr . inet_service ; flags interval ; }'
|
|
|
ad45ff |
| # nft add element ip t my_set '{10.0.0.1 . tcp }'
|
|
|
ad45ff |
| BUG: invalid range expression type concat
|
|
|
ad45ff |
| nft: expression.c:1085: range_expr_value_low: Assertion `0' failed.
|
|
|
ad45ff |
|
|
|
ad45ff |
With this patch in place, the 'add set' command above gives an error
|
|
|
ad45ff |
message:
|
|
|
ad45ff |
|
|
|
ad45ff |
| # nft add set ip t my_set3 '{ type ipv4_addr . inet_service ; flags interval ; }'
|
|
|
ad45ff |
| Error: concatenated types not supported in interval sets
|
|
|
ad45ff |
| add set ip t my_set3 { type ipv4_addr . inet_service ; flags interval ; }
|
|
|
ad45ff |
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
|
ad45ff |
|
|
|
ad45ff |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
ad45ff |
Signed-off-by: Florian Westphal <fw@strlen.de>
|
|
|
ad45ff |
---
|
|
|
ad45ff |
src/evaluate.c | 4 ++++
|
|
|
ad45ff |
1 file changed, 4 insertions(+)
|
|
|
ad45ff |
|
|
|
ad45ff |
diff --git a/src/evaluate.c b/src/evaluate.c
|
|
|
ad45ff |
index 8552e4a..ab1347f 100644
|
|
|
ad45ff |
--- a/src/evaluate.c
|
|
|
ad45ff |
+++ b/src/evaluate.c
|
|
|
ad45ff |
@@ -2865,6 +2865,10 @@ static int set_evaluate(struct eval_ctx *ctx, struct set *set)
|
|
|
ad45ff |
"specified in %s definition",
|
|
|
ad45ff |
set->key->dtype->name, type);
|
|
|
ad45ff |
}
|
|
|
ad45ff |
+ if (set->flags & NFT_SET_INTERVAL &&
|
|
|
ad45ff |
+ set->key->ops->type == EXPR_CONCAT)
|
|
|
ad45ff |
+ return set_error(ctx, set, "concatenated types not supported in interval sets");
|
|
|
ad45ff |
+
|
|
|
ad45ff |
if (set->flags & NFT_SET_MAP) {
|
|
|
ad45ff |
if (set->datatype == NULL)
|
|
|
ad45ff |
return set_error(ctx, set, "map definition does not "
|
|
|
ad45ff |
--
|
|
|
ad45ff |
1.8.3.1
|
|
|
ad45ff |
|