From 015b752465518e072d60f53cf89f8cf4b107d639 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Tue, 13 Aug 2019 22:12:45 +0200 Subject: src: parser: fix parsing of chain priority and policy on bigendian tests/shell/testcases/flowtable/0001flowtable_0 tests/shell/testcases/nft-f/0008split_tables_0 fail the 'dump compare' on s390x. The priority (10) turns to 0, and accept turned to drop. Problem is that '$1' is a 64bit value -- then we pass the address and import 'int' -- we then get the upper all zero bits. Add a 32bit interger type and use that. v2: add uint32_t type to union, v1 used temporary value instead. Fixes: 627c451b2351 ("src: allow variables in the chain priority specification") Fixes: dba4a9b4b5fe ("src: allow variable in chain policy") Signed-off-by: Florian Westphal Acked-by: Pablo Neira Ayuso --- src/parser_bison.y | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/parser_bison.y') diff --git a/src/parser_bison.y b/src/parser_bison.y index 939b9a8d..bff5e274 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -134,6 +134,7 @@ int nft_lex(void *, void *, void *); %union { uint64_t val; + uint32_t val32; const char * string; struct list_head *list; @@ -561,7 +562,8 @@ int nft_lex(void *, void *, void *); %destructor { handle_free(&$$); } table_spec tableid_spec chain_spec chainid_spec flowtable_spec chain_identifier ruleid_spec handle_spec position_spec rule_position ruleset_spec index_spec %type set_spec setid_spec set_identifier flowtable_identifier obj_spec objid_spec obj_identifier %destructor { handle_free(&$$); } set_spec setid_spec set_identifier obj_spec objid_spec obj_identifier -%type family_spec family_spec_explicit chain_policy int_num +%type family_spec family_spec_explicit +%type int_num chain_policy %type extended_prio_spec prio_spec %type extended_prio_name %destructor { xfree($$); } extended_prio_name @@ -2025,7 +2027,7 @@ extended_prio_spec : int_num } ; -int_num : NUM { $$ = $1; } +int_num : NUM { $$ = $1; } | DASH NUM { $$ = -$2; } ; -- cgit v1.2.3