diff options
| author | Phil Sutter <phil@nwl.cc> | 2019-09-13 17:20:04 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2019-09-14 01:05:03 +0200 |
| commit | 5731cc15d3929312c5b63206c8a8a06fb8ce6bab (patch) | |
| tree | 71798e3c49b8b0962a9da1d0fdd2088f7795962d | |
| parent | e1e33b8907bf7c2110bdc3990908a0049bbbe71d (diff) | |
parser_bison: Fix 'exists' keyword on Big Endian
Size value passed to constant_expr_alloc() must correspond with actual
data size, otherwise wrong portion of data will be taken later when
serializing into netlink message.
Booleans require really just a bit, but make type of boolean_keys be
uint8_t (introducing new 'val8' name for it) and pass the data length
using sizeof() to avoid any magic numbers.
While being at it, fix len value in parser_json.c as well although it
worked before due to the value being rounded up to the next multiple of
8.
Fixes: 9fd9baba43c8e ("Introduce boolean datatype and boolean expression")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Florian Westphal <fw@strlen.de>
| -rw-r--r-- | src/parser_bison.y | 5 | ||||
| -rw-r--r-- | src/parser_json.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/parser_bison.y b/src/parser_bison.y index 3fccea67..cd249c82 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -135,6 +135,7 @@ int nft_lex(void *, void *, void *); %union { uint64_t val; uint32_t val32; + uint8_t val8; const char * string; struct list_head *list; @@ -800,7 +801,7 @@ int nft_lex(void *, void *, void *); %type <expr> boolean_expr %destructor { expr_free($$); } boolean_expr -%type <val> boolean_keys +%type <val8> boolean_keys %type <expr> exthdr_exists_expr %destructor { expr_free($$); } exthdr_exists_expr @@ -3964,7 +3965,7 @@ boolean_expr : boolean_keys { $$ = constant_expr_alloc(&@$, &boolean_type, BYTEORDER_HOST_ENDIAN, - 1, &$1); + sizeof($1) * BITS_PER_BYTE, &$1); } ; diff --git a/src/parser_json.c b/src/parser_json.c index 398ae192..5dd410af 100644 --- a/src/parser_json.c +++ b/src/parser_json.c @@ -351,7 +351,8 @@ static struct expr *json_parse_immediate(struct json_ctx *ctx, json_t *root) case JSON_FALSE: buf[0] = json_is_true(root); return constant_expr_alloc(int_loc, &boolean_type, - BYTEORDER_HOST_ENDIAN, 1, buf); + BYTEORDER_HOST_ENDIAN, + BITS_PER_BYTE, buf); default: json_error(ctx, "Unexpected JSON type %s for immediate value.", json_typename(root)); |