From: Florian Westphal <fw@strlen.de>
To: <netfilter-devel@vger.kernel.org>
Cc: a@juaristi.eus, Florian Westphal <fw@strlen.de>
Subject: [PATCH nft 4/4] src: evaluate: catch invalid 'meta day' values in eval step
Date: Thu, 29 Aug 2019 16:09:04 +0200 [thread overview]
Message-ID: <20190829140904.3858-5-fw@strlen.de> (raw)
In-Reply-To: <20190829140904.3858-1-fw@strlen.de>
Signed-off-by: Florian Westphal <fw@strlen.de>
---
src/evaluate.c | 17 +++++++++++++----
tests/py/any/meta.t | 4 ++++
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/evaluate.c b/src/evaluate.c
index 8d5f5f8014b8..b8bcf4866d8d 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -1863,11 +1863,20 @@ static int expr_evaluate_meta(struct eval_ctx *ctx, struct expr **exprp)
{
struct expr *meta = *exprp;
- if (ctx->pctx.family != NFPROTO_INET &&
- meta->flags & EXPR_F_PROTOCOL &&
- meta->meta.key == NFT_META_NFPROTO)
- return expr_error(ctx->msgs, meta,
+ switch (meta->meta.key) {
+ case NFT_META_NFPROTO:
+ if (ctx->pctx.family != NFPROTO_INET &&
+ meta->flags & EXPR_F_PROTOCOL)
+ return expr_error(ctx->msgs, meta,
"meta nfproto is only useful in the inet family");
+ break;
+ case NFT_META_TIME_DAY:
+ __expr_set_context(&ctx->ectx, meta->dtype, meta->byteorder,
+ meta->len, 6);
+ return 0;
+ default:
+ break;
+ }
return expr_evaluate_primary(ctx, exprp);
}
diff --git a/tests/py/any/meta.t b/tests/py/any/meta.t
index 5911b74ac060..86e5d258605d 100644
--- a/tests/py/any/meta.t
+++ b/tests/py/any/meta.t
@@ -218,3 +218,7 @@ meta hour "17:00:00" drop;ok;meta hour "17:00" drop
meta hour "17:00:01" drop;ok
meta hour "00:00" drop;ok
meta hour "00:01" drop;ok
+
+meta time "meh";fail
+meta hour "24:00" drop;fail
+meta day 7 drop;fail
--
2.21.0
prev parent reply other threads:[~2019-08-29 14:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-29 14:09 [PATCH nft 0/4] meta: introduce time/day/hour matching Florian Westphal
2019-08-29 14:09 ` [PATCH nft 1/4] evaluate: New internal helper __expr_evaluate_range Florian Westphal
2019-08-29 14:09 ` [PATCH nft 2/4] meta: Introduce new conditions 'time', 'day' and 'hour' Florian Westphal
2019-08-29 14:09 ` [PATCH nft 3/4] tests: add meta time test cases Florian Westphal
2019-11-12 18:44 ` Phil Sutter
2019-11-12 19:35 ` Florian Westphal
2019-11-12 21:19 ` Phil Sutter
2019-11-12 21:59 ` Phil Sutter
2019-08-29 14:09 ` Florian Westphal [this message]
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=20190829140904.3858-5-fw@strlen.de \
--to=fw@strlen.de \
--cc=a@juaristi.eus \
--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).