[PATCH nft] json: fix type mismatch on "ct expect" json exporting

[PATCH nft] json: fix type mismatch on "ct expect" json exporting

[Fernando Fernandez Mancera]

The size field in ct_expect struct should be parsed as json integer and not as
a string. Also, l3proto field is parsed as string and not as an integer. That
was causing a segmentation fault when exporting "ct expect" objects as json.

Fixes: 1dd08fcfa07a ("src: add ct expectations support")
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
---
 src/json.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/json.c b/src/json.c
index 55ce053..7aa4b69 100644
--- a/src/json.c
+++ b/src/json.c
@@ -333,7 +333,7 @@ static json_t *obj_print_json(const struct obj *obj)
 		json_decref(tmp);
 		break;
 	case NFT_OBJECT_CT_EXPECT:
-		tmp = json_pack("{s:o, s:I, s:I, s:s, s:I}",
+		tmp = json_pack("{s:o, s:I, s:I, s:I, s:s}",
 				"protocol",
 				proto_name_json(obj->ct_expect.l4proto),
 				"dport", obj->ct_expect.dport,
-- 
2.20.1

Re: [PATCH nft] json: fix type mismatch on "ct expect" json exporting

[Pablo Neira Ayuso]

On Fri, Sep 13, 2019 at 01:56:59PM +0200, Fernando Fernandez Mancera wrote:
> The size field in ct_expect struct should be parsed as json integer and not as
> a string. Also, l3proto field is parsed as string and not as an integer. That
> was causing a segmentation fault when exporting "ct expect" objects as json.

Applied, thanks Fernando.

Re: [PATCH nft] json: fix type mismatch on "ct expect" json exporting

[Stéphane Veyret]

Le ven. 13 sept. 2019 à 18:52, Pablo Neira Ayuso <pablo@netfilter.org> a écrit :
>
> On Fri, Sep 13, 2019 at 01:56:59PM +0200, Fernando Fernandez Mancera wrote:
> > The size field in ct_expect struct should be parsed as json integer and not as
> > a string. Also, l3proto field is parsed as string and not as an integer. That
> > was causing a segmentation fault when exporting "ct expect" objects as json.
>
> Applied, thanks Fernando.

Thanks. And sorry… I should have done it, but found no time until now.

Stéphane Veyret