From: Florian Westphal <fw@strlen.de>
To: <netfilter-devel@vger.kernel.org>
Cc: Florian Westphal <fw@strlen.de>
Subject: [PATCH nftables 2/4] src: parser: fix parsing of chain priority and policy on bigendian
Date: Tue, 13 Aug 2019 20:44:07 +0200 [thread overview]
Message-ID: <20190813184409.10757-3-fw@strlen.de> (raw)
In-Reply-To: <20190813184409.10757-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.
Use an intermediate 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 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/parser_bison.y b/src/parser_bison.y
index 939b9a8db6d7..406cf54bdeb8 100644
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -1972,11 +1972,12 @@ extended_prio_name : OUT
extended_prio_spec : int_num
{
struct prio_spec spec = {0};
+ int value = (int)$1;
spec.expr = constant_expr_alloc(&@$, &integer_type,
BYTEORDER_HOST_ENDIAN,
sizeof(int) *
- BITS_PER_BYTE, &$1);
+ BITS_PER_BYTE, &value);
$$ = spec;
}
| variable_expr
@@ -2052,10 +2053,12 @@ policy_expr : variable_expr
}
| chain_policy
{
+ int value = (int)$1;
+
$$ = constant_expr_alloc(&@$, &integer_type,
BYTEORDER_HOST_ENDIAN,
sizeof(int) *
- BITS_PER_BYTE, &$1);
+ BITS_PER_BYTE, &value);
}
;
--
2.21.0
next prev parent reply other threads:[~2019-08-13 18:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-13 18:44 [PATCH nftables 0/4] un-break nftables on big-endian arches Florian Westphal
2019-08-13 18:44 ` [PATCH nftables 1/4] src: fix jumps on bigendian arches Florian Westphal
2019-08-13 19:20 ` Pablo Neira Ayuso
2019-08-13 19:34 ` Florian Westphal
2019-08-13 19:35 ` Pablo Neira Ayuso
2019-08-13 18:44 ` Florian Westphal [this message]
2019-08-13 19:26 ` [PATCH nftables 2/4] src: parser: fix parsing of chain priority and policy on bigendian Pablo Neira Ayuso
2019-08-13 18:44 ` [PATCH nftables 3/4] src: mnl: fix setting rcvbuffer size Florian Westphal
2019-08-13 19:26 ` Pablo Neira Ayuso
2019-08-13 18:44 ` [PATCH nftables 4/4] src: mnl: retry when we hit -ENOBUFS Florian Westphal
2019-08-13 19:34 ` Pablo Neira Ayuso
2019-08-13 19:36 ` Florian Westphal
2019-08-13 19:39 ` Pablo Neira Ayuso
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=20190813184409.10757-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).