51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
From 34c1337296807b3a3147c95268f5e4ca70811779 Mon Sep 17 00:00:00 2001
|
|
From: Phil Sutter <phil@nwl.cc>
|
|
Date: Wed, 20 Sep 2023 19:11:45 +0200
|
|
Subject: [PATCH] parser_json: Proper ct expectation attribute parsing
|
|
|
|
Parts of the code were unsafe (parsing 'I' format into uint32_t), the
|
|
rest just plain wrong (parsing 'o' format into char *tmp). Introduce a
|
|
temporary int variable to parse into.
|
|
|
|
Fixes: 1dd08fcfa07a4 ("src: add ct expectations support")
|
|
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
---
|
|
src/parser_json.c | 13 +++++++------
|
|
1 file changed, 7 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/parser_json.c b/src/parser_json.c
|
|
index da056814..b41ddf2e 100644
|
|
--- a/src/parser_json.c
|
|
+++ b/src/parser_json.c
|
|
@@ -3447,8 +3447,8 @@ static struct cmd *json_parse_cmd_add_object(struct json_ctx *ctx,
|
|
{
|
|
const char *family, *tmp, *rate_unit = "packets", *burst_unit = "bytes";
|
|
uint32_t l3proto = NFPROTO_UNSPEC;
|
|
+ int inv = 0, flags = 0, i;
|
|
struct handle h = { 0 };
|
|
- int inv = 0, flags = 0;
|
|
struct obj *obj;
|
|
json_t *jflags;
|
|
|
|
@@ -3599,11 +3599,12 @@ static struct cmd *json_parse_cmd_add_object(struct json_ctx *ctx,
|
|
return NULL;
|
|
}
|
|
}
|
|
- if (!json_unpack(root, "{s:o}", "dport", &tmp))
|
|
- obj->ct_expect.dport = atoi(tmp);
|
|
- json_unpack(root, "{s:I}", "timeout", &obj->ct_expect.timeout);
|
|
- if (!json_unpack(root, "{s:o}", "size", &tmp))
|
|
- obj->ct_expect.size = atoi(tmp);
|
|
+ if (!json_unpack(root, "{s:i}", "dport", &i))
|
|
+ obj->ct_expect.dport = i;
|
|
+ if (!json_unpack(root, "{s:i}", "timeout", &i))
|
|
+ obj->ct_expect.timeout = i;
|
|
+ if (!json_unpack(root, "{s:i}", "size", &i))
|
|
+ obj->ct_expect.size = i;
|
|
break;
|
|
case CMD_OBJ_LIMIT:
|
|
obj->type = NFT_OBJECT_LIMIT;
|
|
--
|
|
2.33.0
|
|
|