src: evaluate: support prefix expression in statements
Florian Westphal
maintainerPATCH v2 1/1 src: evaluate: support prefix expression in statements
Currently nft dumps core when it encounters a prefix expression as part of a statement, e.g.
iifname ens3 snat to 10.0.0.0/28
yields:
BUG: unknown expression type prefix
nft: netlink_linearize.c:688: netlink_gen_expr: Assertion `0' failed.
This assertion is correct -- we can't linearize a prefix because kernel doesn't know what that is.
For LHS prefixes, they get converted to a binary 'and' such as '10.0.0.0 & 255.255.255.240'. For RHS, we can do something similar and convert them into a range.
snat to 10.0.0.0/28 will be converted into:
iifname "ens3" snat to 10.0.0.0-10.0.0.15
--- src/evaluate.c | 48 +++++++++++++++++++++++++++++++++ tests/py/ip6/dnat.t | 2 ++ tests/py/ip6/dnat.t.json | 27 +++++++++++++++++++ tests/py/ip6/dnat.t.payload.ip6 | 12 +++++++++ 4 files changed, 89 insertions(+)
src/evaluate.c +48 -0
@@ -1933,6 +1933,52 @@ static int stmt_evaluate_expr(struct eval_ctx *ctx, struct stmt *stmt)return expr_evaluate (ctx, &stmt->expr); } +static int stmt_prefix_conversion (struct eval_ctx *ctx,struct expr **expr, +enum byteorder byteorder) +{ +struct expr *mask, *and, *or, *prefix, *base, *range; +int ret; + + prefix = *expr; + base = prefix->prefix; + +if (base->etype !=EXPR_VALUE ) +return expr_error (ctx->msgs, prefix, +"you cannot specify a prefix here, " +"unknown type %s" , base->dtype->name); + +if (!expr_is_constant (base)) +return expr_error (ctx->msgs, prefix, +"Prefix expression is undefined for " +"non-constant expressions" ); + +if (expr_basetype (base)->type !=TYPE_INTEGER ) +return expr_error (ctx->msgs, prefix, +"Prefix expression expected integer value" ); + + mask =constant_expr_alloc (&prefix->location,expr_basetype (base), +BYTEORDER_HOST_ENDIAN , base->len,NULL ); + +mpz_prefixmask (mask->value, base->len, prefix->prefix_len); + and =binop_expr_alloc (&prefix->location,OP_AND ,expr_get (base), mask); + + mask =constant_expr_alloc (&prefix->location,expr_basetype (base), +BYTEORDER_HOST_ENDIAN , base->len,NULL ); +mpz_bitmask (mask->value, prefix->len - prefix->prefix_len); + or =binop_expr_alloc (&prefix->location,OP_OR ,expr_get (base), mask); + + range =range_expr_alloc (&prefix->location, and, or); + ret =expr_evaluate (ctx, &range); +if (ret <0 ) { +expr_free (range); +return ret; + } + +expr_free (*expr); + *expr = range; +return 0 ; +} +static int stmt_evaluate_arg (struct eval_ctx *ctx,struct stmt *stmt,const struct datatype *dtype,unsigned int len,enum byteorder byteorder,struct expr **expr)
@@ -1969,6 +2015,8 @@ static int stmt_evaluate_arg(struct eval_ctx *ctx, struct stmt *stmt, "unknown value to use");case EXPR_RT :return byteorder_conversion (ctx, expr, byteorder); +case EXPR_PREFIX : +return stmt_prefix_conversion (ctx, expr, byteorder);default :break ; }
tests/py/ip6/dnat.t +2 -0
@@ -5,3 +5,5 @@ tcp dport 80-90 dnat to [2001:838:35f:1::]-[2001:838:35f:2::]:80-100;ok tcp dport 80-90 dnat to [2001:838:35f:1::]-[2001:838:35f:2::]:100;ok;tcp dport 80-90 dnat to [2001:838:35f:1::]-[2001:838:35f:2::]:100 tcp dport 80-90 dnat to [2001:838:35f:1::]:80;ok +dnat to [2001:838:35f:1::]/64;ok;dnat to 2001:838:35f:1::-2001:838:35f:1:ffff:ffff:ffff:ffff +dnat to 2001:838:35f:1::-2001:838:35f:1:ffff:ffff:ffff:ffff;ok
tests/py/ip6/dnat.t.json +27 -0
@@ -76,3 +76,30 @@ } ] +# dnat to [2001:838:35f:1::]/64 +[ + { + "dnat": { + "addr": { + "range": [ + "2001:838:35f:1::", + "2001:838:35f:1:ffff:ffff:ffff:ffff" + ] + } + } + } +] + +# dnat to 2001:838:35f:1::-2001:838:35f:1:ffff:ffff:ffff:ffff +[ + { + "dnat": { + "addr": { + "range": [ + "2001:838:35f:1::", + "2001:838:35f:1:ffff:ffff:ffff:ffff" + ] + } + } + } +]
tests/py/ip6/dnat.t.payload.ip6 +12 -0
@@ -33,3 +33,15 @@ ip6 test-ip6 prerouting [ immediate reg 1 0x38080120 0x01005f03 0x00000000 0x00000000 ] [ immediate reg 2 0x00005000 ] [ nat dnat ip6 addr_min reg 1 addr_max reg 0 proto_min reg 2 proto_max reg 0 ] + +# dnat to [2001:838:35f:1::]/64 +ip6 test-ip6 prerouting + [ immediate reg 1 0x38080120 0x01005f03 0x00000000 0x00000000 ] + [ immediate reg 2 0x38080120 0x01005f03 0xffffffff 0xffffffff ] + [ nat dnat ip6 addr_min reg 1 addr_max reg 2 ] + +# dnat to 2001:838:35f:1::-2001:838:35f:1:ffff:ffff:ffff:ffff +ip6 test-ip6 prerouting + [ immediate reg 1 0x38080120 0x01005f03 0x00000000 0x00000000 ] + [ immediate reg 2 0x38080120 0x01005f03 0xffffffff 0xffffffff ] + [ nat dnat ip6 addr_min reg 1 addr_max reg 2 ]
Signature · 1 line
2.21.0
Quoted 15 lines · Florian Westphal
Currently nft dumps core when it encounters a prefix expression as part of a statement, e.g.
iifname ens3 snat to 10.0.0.0/28yields:
BUG: unknown expression type prefixnft: netlink_linearize.c:688:
netlink_gen_expr: Assertion `0' failed.This assertion is correct -- we can't linearize a prefix because kernel doesn't know what that is.
For LHS prefixes, they get converted to a binary 'and' such as '10.0.0.0 & 255.255.255.240'. For RHS, we can do something similar and convert them into a range.
Quoted 5 lines
snat to 10.0.0.0/28 will be converted into:
iifname "ens3" snat to 10.0.0.0-10.0.0.15
Please, double check before pushing this out that valgrind is happy with this (no memleaks).
Thanks.
Florian Westphal
maintainerQuoted 7 lines · Pablo Neira Ayuso
Quoted 2 lines
Please, double check before pushing this out that valgrind is happy with this (no memleaks).
Doesn't show any. I removed the last expr_free() and then I can see the expected leak when runnign the dnat.t test.
Thus, pushed to master, thanks for reviewing this.