All of lore.kernel.org
 help / color / mirror / Atom feed
From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [nft PATCH 1/9] parser_json: Catch wrong "reset" payload
Date: Wed, 20 Sep 2023 22:57:19 +0200	[thread overview]
Message-ID: <20230920205727.22103-2-phil@nwl.cc> (raw)
In-Reply-To: <20230920205727.22103-1-phil@nwl.cc>

The statement happily accepted any valid expression as payload and
assumed it to be a tcpopt expression (actually, a special case of
exthdr). Add a check to make sure this is the case.

Standard syntax does not provide this flexibility, so no need to have
the check there as well.

Fixes: 5d837d270d5a8 ("src: add tcp option reset support")
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 src/parser_json.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/parser_json.c b/src/parser_json.c
index 4ea5b4326a900..242f05eece58c 100644
--- a/src/parser_json.c
+++ b/src/parser_json.c
@@ -2797,7 +2797,14 @@ static struct stmt *json_parse_optstrip_stmt(struct json_ctx *ctx,
 {
 	struct expr *expr = json_parse_expr(ctx, value);
 
-	return expr ? optstrip_stmt_alloc(int_loc, expr) : NULL;
+	if (!expr ||
+	    expr->etype != EXPR_EXTHDR ||
+	    expr->exthdr.op != NFT_EXTHDR_OP_TCPOPT) {
+		json_error(ctx, "Illegal TCP optstrip argument");
+		return NULL;
+	}
+
+	return optstrip_stmt_alloc(int_loc, expr);
 }
 
 static struct stmt *json_parse_stmt(struct json_ctx *ctx, json_t *root)
-- 
2.41.0


  reply	other threads:[~2023-09-20 20:57 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-20 20:57 [nft PATCH 0/9] Misc JSON parser fixes Phil Sutter
2023-09-20 20:57 ` Phil Sutter [this message]
2023-09-20 20:57 ` [nft PATCH 2/9] parser_json: Fix typo in json_parse_cmd_add_object() Phil Sutter
2023-09-20 20:57 ` [nft PATCH 3/9] parser_json: Proper ct expectation attribute parsing Phil Sutter
2023-09-20 20:57 ` [nft PATCH 4/9] parser_json: Fix flowtable prio value parsing Phil Sutter
2023-09-20 20:57 ` [nft PATCH 5/9] parser_json: Fix limit object burst " Phil Sutter
2023-09-20 20:57 ` [nft PATCH 6/9] parser_json: Fix synproxy object mss/wscale parsing Phil Sutter
2023-09-20 20:57 ` [nft PATCH 7/9] parser_json: Wrong check in json_parse_ct_timeout_policy() Phil Sutter
2023-09-20 20:57 ` [nft PATCH 8/9] parser_json: Catch nonsense ops in match statement Phil Sutter
2023-09-20 20:57 ` [nft PATCH 9/9] parser_json: Default meter size to zero Phil Sutter
2023-09-22  8:56 ` [nft PATCH 0/9] Misc JSON parser fixes Phil Sutter

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=20230920205727.22103-2-phil@nwl.cc \
    --to=phil@nwl.cc \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.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.