parser_bison: Fix 'exists' keyword on Big Endian
Phil Sutter
reviewerPATCH v2 1/1 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.
---
Changes since v1:
- Dropped pointless 'sizeof(char)' factor from product in src/parser_json.c.
--- src/parser_bison.y | 5 +++-- src/parser_json.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-)
src/parser_bison.y +3 -2
@@ -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); } ;
src/parser_json.c +2 -1
@@ -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));
Signature · 1 line
2.22.0
Florian Westphal
maintainerQuoted 11 lines · Phil Sutter
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_keysbeuint8_t(introducing new 'val8' name for it) and pass the data length usingsizeof()to avoid any magic numbers.While being at it, fix len value in
parser_json.cas well although it worked before due to the value being rounded up to the next multiple of 8.
Looks good, thanks Phil.
Phil Sutter
reviewerHi!
Quoted 9 lines · Florian Westphal
Quoted 8 lines · Phil Sutter
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_keysbeuint8_t(introducing new 'val8' name for it) and pass the data length usingsizeof()to avoid any magic numbers.
Quoted 5 lines
Quoted 3 lines
While being at it, fix len value in
parser_json.cas well although it worked before due to the value being rounded up to the next multiple of 8.Looks good, thanks Phil.
So that's an ACK? :)
Cheers, Phil
Florian Westphal
maintainerQuoted 10 lines · Phil Sutter
Quoted 9 lines · Florian Westphal
Quoted 8 lines · Phil Sutter
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_keysbeuint8_t(introducing new 'val8' name for it) and pass the data length usingsizeof()to avoid any magic numbers.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
While being at it, fix len value in
parser_json.cas well although it worked before due to the value being rounded up to the next multiple of 8.Looks good, thanks Phil.
So that's an ACK? :)
Yes, feel free to push this.