evaluate: store byteorder for set keys
Pablo Neira Ayuso
maintainerPATCH 1/2 evaluate: store byteorder for set keys
Selectors that rely on the integer type and expect host endian byteorder don't work properly.
We need to keep the byteorder around based on the left hand size expression that provides the context, so store the byteorder when evaluating the map.
Before this patch.
# nft --debug=netlink add rule x y meta mark set meta cpu map { 0 : 1, 1 : 2 }
__map%d x b
__map%d x 0
element 00000000 : 00000001 0 [end] element 01000000 : 00000002 0 [end]
^^^^^^^^This is expressed in network byteorder, because the invalid byteorder defaults on this.
After this patch:
# nft --debug=netlink add rule x y meta mark set meta cpu map { 0 : 1, 1 : 2 }
__map%d x b
__map%d x 0
element 00000000 : 00000001 0 [end] element 00000001 : 00000002 0 [end]
^^^^^^^^This is in host byteorder, as the key selector in the map mandates.
--- include/datatype.h | 4 ++++ src/datatype.c | 48 +++++++++++++++++++++++++++++++++++++++++++----- src/evaluate.c | 17 +++++++++++------ src/rule.c | 1 + 4 files changed, 59 insertions(+), 11 deletions(-)
include/datatype.h +4 -0
@@ -251,6 +251,10 @@ concat_subtype_lookup(uint32_t type, unsigned int n)return datatype_lookup (concat_subtype_id (type, n)); } +extern const struct datatype * +set_keytype_alloc (const struct datatype *orig_dtype,unsigned int byteorder); +extern void set_keytype_destroy (const struct datatype *dtype); +extern void time_print (uint64_t seconds);extern struct error_record *time_parse (const struct location *loc,const char *c,uint64_t *res);
src/datatype.c +43 -5
60 lines not on this page · raw message
src/evaluate.c +11 -6
@@ -63,6 +63,7 @@ static struct expr *implicit_set_declaration(struct eval_ctx *ctx,const char *name, const struct datatype *keytype, unsigned int keylen, + unsigned int keybyteorder, struct expr *expr) { struct cmd *cmd;
@@ -72,7 +73,7 @@ static struct expr *implicit_set_declaration(struct eval_ctx *ctx, set =set_alloc (&expr->location); set->flags =NFT_SET_ANONYMOUS | expr->set_flags; set->handle.set =xstrdup (name), - set->keytype = keytype; + set->keytype =set_keytype_alloc (keytype, keybyteorder); set->keylen = keylen; set->init = expr;
@@ -1170,7 +1171,9 @@ static int expr_evaluate_map(struct eval_ctx *ctx, struct expr **expr)case EXPR_SET : mappings =implicit_set_declaration (ctx,"__map%d" , ctx->ectx.dtype, - ctx->ectx.len, mappings); + ctx->ectx.len, + ctx->ectx.byteorder, + mappings); mappings->set->datatype = ectx.dtype; mappings->set->datalen = ectx.len;
@@ -1505,8 +1508,8 @@ static int expr_evaluate_relational(struct eval_ctx *ctx, struct expr **expr)if (right->ops->type ==EXPR_SET ) right = rel->right =implicit_set_declaration (ctx,"__set%d" , - left->dtype, - left->len, right); + left->dtype, left->len, + left->byteorder, right);else if (!datatype_equal (left->dtype, right->dtype))return expr_binary_error (ctx->msgs, right, left, "datatype mismatch, expected %s, "
@@ -1565,7 +1568,7 @@ static int expr_evaluate_relational(struct eval_ctx *ctx, struct expr **expr) right = rel->right =implicit_set_declaration (ctx,"__set%d" , left->dtype, left->len, - right); + left->byteorder, right);/* fall through */ case EXPR_SET_REF :assert (rel->op ==OP_NEQ );
@@ -1886,7 +1889,8 @@ static int stmt_evaluate_flow(struct eval_ctx *ctx, struct stmt *stmt) set->set_flags |=NFT_SET_TIMEOUT ; setref =implicit_set_declaration (ctx, stmt->flow.table ?:"__ft%d" , - key->dtype, key->len, set); + key->dtype, key->len, + key->dtype->byteorder, set); stmt->flow.set = setref;
@@ -2518,6 +2522,7 @@ static int stmt_evaluate_objref_map(struct eval_ctx *ctx, struct stmt *stmt) mappings =implicit_set_declaration (ctx,"__objmap%d" , ctx->ectx.dtype, ctx->ectx.len, + ctx->ectx.byteorder, mappings); mappings->set->datatype = &string_type; mappings->set->datalen =NFT_OBJ_MAXNAMELEN *BITS_PER_BYTE ;
src/rule.c +1 -0
@@ -210,6 +210,7 @@ void set_free(struct set *set)if (set->init !=NULL )expr_free (set->init);handle_free (&set->handle); +set_keytype_destroy (set->keytype);xfree (set); }
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerPATCH 2/2 netlink: store set byteorder in NFTA_SET_USERDATA
The integer datatype has neither specific byteorder nor length. This results in the following broken output:
# nft list ruleset
table ip x {
chain y {
mark set cpu map { 0 : 0x00000001, 16777216 : 0x00000002}
}
}Currently, with BYTEORDER_INVALID, nft defaults on network byteorder, hence the output above.
This patch stores the key byteorder in the userdata using a TLV structure in the NFTA_SET_USERDATA area, so nft can interpret key accordingly when dumping the set back to userspace.
Thus, after this patch the listing is correct:
# nft list ruleset
table ip x {
chain y {
mark set cpu map { 0 : 0x00000001, 1 : 0x00000002}
}
}---
@Florian: You can rebase your ct zone patchset on top of this, so you don't
need your original 5/8 anymore.
BTW, this uncovered a bug in the new bitmap set type that I'm addressing now.
include/rule.h | 6 ++++++ src/netlink.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-)
include/rule.h +6 -0
@@ -477,4 +477,10 @@ enum udata_type {#define UDATA_COMMENT_MAXLEN 128 +enum udata_set_type { +UDATA_SET_KEYBYTEORDER , + __UDATA_SET_MAX, +}; +#define UDATA_SET_MAX (__UDATA_SET_MAX - 1) +#endif /* NFTABLES_RULE_H */
src/netlink.c +59 -1
96 lines not on this page · raw message
Signature · 1 line
2.1.4