From: Florian Westphal <fw@strlen.de>
To: <netfilter-devel@vger.kernel.org>
Cc: Florian Westphal <fw@strlen.de>
Subject: [PATCH nftables 2/3] src: parser: fix parsing of chain priority and policy on bigendian
Date: Tue, 13 Aug 2019 22:12:45 +0200 [thread overview]
Message-ID: <20190813201246.5543-3-fw@strlen.de> (raw)
In-Reply-To: <20190813201246.5543-1-fw@strlen.de>
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 <fw@strlen.de>
---
src/parser_bison.y | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/parser_bison.y b/src/parser_bison.y
index 939b9a8db6d7..bff5e274c787 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 <handle> 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 <val> family_spec family_spec_explicit chain_policy int_num
+%type <val> family_spec family_spec_explicit
+%type <val32> int_num chain_policy
%type <prio_spec> extended_prio_spec prio_spec
%type <string> 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; }
;
--
2.21.0
next prev parent reply other threads:[~2019-08-13 20:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-13 20:12 [PATCH v2 nftables 0/3] un-break nftables on big-endian arches Florian Westphal
2019-08-13 20:12 ` [PATCH nftables 1/3] src: fix jumps on bigendian arches Florian Westphal
2019-08-14 7:41 ` Pablo Neira Ayuso
2019-08-13 20:12 ` Florian Westphal [this message]
2019-08-14 7:42 ` [PATCH nftables 2/3] src: parser: fix parsing of chain priority and policy on bigendian Pablo Neira Ayuso
2019-08-13 20:12 ` [PATCH nftables 3/3] src: mnl: retry when we hit -ENOBUFS Florian Westphal
2019-08-14 7:42 ` Pablo Neira Ayuso
2019-09-09 21:11 ` Eric Garver
2019-09-09 22:12 ` Florian Westphal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190813201246.5543-3-fw@strlen.de \
--to=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.