diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-04-18 19:10:28 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-04-27 12:30:34 +0200 |
| commit | 3f84f4ad0568f22106f283a3077a85957e83fe57 (patch) | |
| tree | ca34c7f5b70e73ee189d4a3acc333ca408aeb2a6 | |
| parent | 4935a0d561b57f46cdd0649b3bb1063f7e897f00 (diff) | |
evaluate: bail out on prefix or range to non-interval set
If you declare a set with no interval flag, you get this bug message:
# nft add element filter myset { 192.168.1.100/24 }
BUG: invalid data expression type prefix
nft: netlink.c:323: netlink_gen_data: Assertion `0' failed.
Aborted
After this patch, we provide a clue to the user:
# nft add element filter myset { 192.168.1.100/24 }
<cmdline>:1:23-38: Error: Set member cannot be prefix, missing interval flag on declaration
add element filter myset { 192.168.1.100/24 }
^^^^^^^^^^^^^^^^
# nft add element filter myset { 192.168.1.100-192.168.1.200 }
<cmdline>:1:23-49: Error: Set member cannot be range, missing interval flag on declaration
add element filter myset { 192.168.1.100-192.168.1.200 }
^^^^^^^^^^^^^^^^^^^^^^^^^^^
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/evaluate.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index 63c0091d..7444d09c 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -929,6 +929,22 @@ static int expr_evaluate_set_elem(struct eval_ctx *ctx, struct expr **expr) if (expr_evaluate(ctx, &elem->key) < 0) return -1; + if (ctx->set && + !(ctx->set->flags & (SET_F_ANONYMOUS | SET_F_INTERVAL))) { + switch (elem->key->ops->type) { + case EXPR_PREFIX: + return expr_error(ctx->msgs, elem, + "Set member cannot be prefix, " + "missing interval flag on declaration"); + case EXPR_RANGE: + return expr_error(ctx->msgs, elem, + "Set member cannot be range, " + "missing interval flag on declaration"); + default: + break; + } + } + elem->dtype = elem->key->dtype; elem->len = elem->key->len; elem->flags = elem->key->flags; |