rule: don't release the tree parameter in the function nft_jansson_parse_rule
PATCH v2 1/1 rule: don't release the tree parameter in the function nft_jansson_parse_rule
Already, we release the tree that we receive from the parameter in nft_jansson_parse_rule. With this patch, we're going to release the tree where we create it. Therefore, we will have a code more traceable and readable.
---
[changes in v2]
* Reworked the description
src/rule.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
src/rule.c +5 -3
@@ -597,10 +597,8 @@ int nft_jansson_parse_rule(struct nft_rule *r, json_t *tree, nft_rule_add_expr(r, e); } -nft_jansson_free_root (tree);return 0 ; err: -nft_jansson_free_root (tree);return -1 ; }#endif
@@ -613,12 +611,16 @@ static int nft_rule_json_parse(struct nft_rule *r, const void *json,#ifdef JSON_PARSING json_t *tree;json_error_t error; +int ret; tree =nft_jansson_create_root (json, &error, err, input);if (tree ==NULL )return -1 ; -return nft_jansson_parse_rule (r, tree, err, set_list); + ret =nft_jansson_parse_rule (r, tree, err, set_list); + +nft_jansson_free_root (tree); +return ret;#else errno =EOPNOTSUPP ;return -1 ;
Signature · 1 line
1.7.10.4
PATCH v2 1/1 ruleset: fix a leak when we use the set lists
==18632== 285 (16 direct, 269 indirect) bytes in 1 blocks are definitely lost in loss record 6 of 6
==18632== at 0x4C272B8: calloc (vg_replace_malloc.c:566) ==18632== by 0x5043822: nft_set_list_alloc (set.c:977) ==18632== by 0x5045483: nft_ruleset_json_parse (ruleset.c:442) ==18632== by 0x50458BE: nft_ruleset_do_parse (ruleset.c:696) ==18632== by 0x408AEC: do_command (rule.c:1317) ==18632== by 0x406B05: nft_run (main.c:194) ==18632== by 0x40667C: main (main.c:360)
---
[changes in v2]
* Reworked the description. Removed overelaborate info.
* Fixed leaks in error path.
src/ruleset.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
src/ruleset.c +14 -10
@@ -439,10 +439,6 @@ static int nft_ruleset_json_parse_ruleset(struct nft_parse_ctx *ctx,json_t *node, *array = ctx->json;int len, i, ret; - ctx->set_list =nft_set_list_alloc (); -if (ctx->set_list ==NULL ) -return -1 ; - len =json_array_size (array);for (i =0 ; i < len; i++) { node =json_array_get (array, i);
@@ -525,12 +521,16 @@ static int nft_ruleset_json_parse(const void *json, ctx.cb = cb; ctx.format = type; + ctx.set_list =nft_set_list_alloc (); +if (ctx.set_list ==NULL ) +return -1 ; +if (arg !=NULL )nft_ruleset_ctx_set (&ctx,NFT_RULESET_CTX_DATA , arg); root =nft_jansson_create_root (json, &error, err, input);if (root ==NULL ) -return -1 ; + goto err; array =json_object_get (root,"nftables" );if (array ==NULL ) {
@@ -554,9 +554,11 @@ static int nft_ruleset_json_parse(const void *json, goto err; } +nft_set_list_free (ctx.set_list);nft_jansson_free_root (root);return 0 ; err: +nft_set_list_free (ctx.set_list);nft_jansson_free_root (root);return -1 ;#else
@@ -573,10 +575,6 @@ static int nft_ruleset_xml_parse_ruleset(struct nft_parse_ctx *ctx,mxml_node_t *node, *array = ctx->xml;int len =0 , ret; - ctx->set_list =nft_set_list_alloc (); -if (ctx->set_list ==NULL ) -return -1 ; - for (node = mxmlFindElement(array, array, NULL, NULL, NULL, MXML_DESCEND_FIRST); node != NULL;
@@ -653,12 +651,16 @@ static int nft_ruleset_xml_parse(const void *xml, struct nft_parse_err *err, ctx.cb = cb; ctx.format = type; + ctx.set_list =nft_set_list_alloc (); +if (ctx.set_list ==NULL ) +return -1 ; +if (arg !=NULL )nft_ruleset_ctx_set (&ctx,NFT_RULESET_CTX_DATA , arg); tree =nft_mxml_build_tree (xml,"nftables" , err, input);if (tree ==NULL ) -return -1 ; + goto err; ctx.xml = tree;
@@ -670,9 +672,11 @@ static int nft_ruleset_xml_parse(const void *xml, struct nft_parse_err *err, nodecmd = mxmlWalkNext(tree, tree, MXML_NO_DESCEND); } +nft_set_list_free (ctx.set_list);mxmlDelete (tree);return 0 ; err: +nft_set_list_free (ctx.set_list);mxmlDelete (tree);return -1 ;#else
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerRe: [libnftnl PATCH v2] ruleset: fix a leak when we use the set lists
Quoted 9 lines · Alvaro Neira Ayuso
==18632== 285 (16 direct, 269 indirect) bytes in 1 blocks are definitely lost in loss record 6 of 6
==18632== at 0x4C272B8: calloc (vg_replace_malloc.c:566) ==18632== by 0x5043822: nft_set_list_alloc (set.c:977) ==18632== by 0x5045483: nft_ruleset_json_parse (ruleset.c:442) ==18632== by 0x50458BE: nft_ruleset_do_parse (ruleset.c:696) ==18632== by 0x408AEC: do_command (rule.c:1317) ==18632== by 0x406B05: nft_run (main.c:194) ==18632== by 0x40667C: main (main.c:360)
Also applied. I found more leaks, just pushed a patch to fix them
Re: [libnftnl PATCH v2] ruleset: fix a leak when we use the set lists
Quoted 11 lines · Pablo Neira Ayuso
Quoted 9 lines · Alvaro Neira Ayuso
==18632== 285 (16 direct, 269 indirect) bytes in 1 blocks are definitely lost in loss record 6 of 6
==18632== at 0x4C272B8: calloc (vg_replace_malloc.c:566) ==18632== by 0x5043822: nft_set_list_alloc (set.c:977) ==18632== by 0x5045483: nft_ruleset_json_parse (ruleset.c:442) ==18632== by 0x50458BE: nft_ruleset_do_parse (ruleset.c:696) ==18632== by 0x408AEC: do_command (rule.c:1317) ==18632== by 0x406B05: nft_run (main.c:194) ==18632== by 0x40667C: main (main.c:360)
Quoted 2 lines
Also applied. I found more leaks, just pushed a patch to fix them
I have already seen the changes. Sorry and thanks Pablo to fix them. --
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 3 lines · Alvaro Neira Ayuso
Already, we release the tree that we receive from the parameter in
nft_jansson_parse_rule. With this patch, we're going to release the tree where we create it. Therefore, we will have a code more traceable and readable.
Applied.