fixes for json parser
Pablo Neira Ayuso
maintainercover fixes for json parser
Hi,
This is a series of patches from Sebastian Walz for the json parser including one that is based on another patch from him too.
I have split the original patches and applied some clean ups, any mistake in them are my fault.
Pablo Neira Ayuso (1):
parser_json: fix handle memleak from error path
Sebastian Walz (sivizius) (3):
parser_json: release buffer returned by json_dumps
parser_json: fix several expression memleaks from error path
parser_json: fix crash in json_parse_set_stmt_list
src/parser_json.c | 121 ++++++++++++++++++++++++++-------------------- 1 file changed, 68 insertions(+), 53 deletions(-)
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 1/4 parser_json: release buffer returned by json_dumps
From: "Sebastian Walz (sivizius)" <[email protected]>
The signature of json_dumps is:
char *json_dumps(const json_t *json, size_t flags):
It will return a pointer to an owned string, the caller must free it. However, json_error just borrows the string to format it as %s, but after printing the formatted error message, the pointer to the string is lost and thus never freed.
--- src/parser_json.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
src/parser_json.c +8 -3
@@ -181,8 +181,11 @@ static int json_unpack_stmt(struct json_ctx *ctx, json_t *root,assert (value);if (json_object_size (root) !=1 ) { +const char *dump =json_dumps (root,0 ); +json_error (ctx,"Malformed object (too many properties): '%s'." , -json_dumps (root,0 )); + dump); +free_const (dump);return 1 ; }
@@ -3378,8 +3381,10 @@ static struct cmd *json_parse_cmd_add_set(struct json_ctx *ctx, json_t *root, }else if ((set->data =json_parse_dtype_expr (ctx, tmp))) { set->flags |=NFT_SET_MAP ; }else { -json_error (ctx,"Invalid map type '%s'." , -json_dumps (tmp,0 )); +const char *dump =json_dumps (tmp,0 ); + +json_error (ctx,"Invalid map type '%s'." , dump); +free_const (dump);set_free (set);handle_free (&h);return NULL ;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/4 parser_json: fix several expression memleaks from error path
In reply to Pablo Neira AyusoFrom: "Sebastian Walz (sivizius)" <[email protected]>
--- src/parser_json.c | 4 ++++ 1 file changed, 4 insertions(+)
src/parser_json.c +4 -0
@@ -1308,6 +1308,7 @@ static struct expr *json_parse_range_expr(struct json_ctx *ctx, expr_high =json_parse_primary_expr (ctx, high);if (!expr_high) {json_error (ctx,"Invalid high value in range expression." ); +expr_free (expr_low);return NULL ; }return range_expr_alloc (int_loc, expr_low, expr_high);
@@ -1889,6 +1890,8 @@ static struct stmt *json_parse_mangle_stmt(struct json_ctx *ctx,return stmt;default :json_error (ctx,"Invalid mangle statement key expression type." ); +expr_free (key); +expr_free (value);return NULL ; } }
@@ -2888,6 +2891,7 @@ static struct stmt *json_parse_optstrip_stmt(struct json_ctx *ctx, expr->etype != EXPR_EXTHDR || expr->exthdr.op != NFT_EXTHDR_OP_TCPOPT) {json_error (ctx,"Illegal TCP optstrip argument" ); +expr_free (expr);return NULL ; }
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 3/4 parser_json: fix handle memleak from error path
In reply to Pablo Neira AyusoBased on patch from Sebastian Walz.
--- src/parser_json.c | 93 ++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 46 deletions(-)
src/parser_json.c +47 -46
@@ -3168,8 +3168,7 @@ static struct cmd *json_parse_cmd_add_chain(struct json_ctx *ctx, json_t *root, chain->hook.name =chain_hookname_lookup (hookstr);if (!chain->hook.name) {json_error (ctx,"Invalid chain hook '%s'." , hookstr); -chain_free (chain); -return NULL ; + goto err_free_chain; }json_unpack (root,"{s:o}" ,"dev" , &devs);
@@ -3178,8 +3177,7 @@ static struct cmd *json_parse_cmd_add_chain(struct json_ctx *ctx, json_t *root, chain->dev_expr =json_parse_devs (ctx, devs);if (!chain->dev_expr) {json_error (ctx,"Invalid chain dev." ); -chain_free (chain); -return NULL ; + goto err_free_chain; } }
@@ -3187,8 +3185,7 @@ static struct cmd *json_parse_cmd_add_chain(struct json_ctx *ctx, json_t *root, chain->policy =parse_policy (policy);if (!chain->policy) {json_error (ctx,"Unknown policy '%s'." , policy); -chain_free (chain); -return NULL ; + goto err_free_chain; } }
@@ -3197,6 +3194,11 @@ static struct cmd *json_parse_cmd_add_chain(struct json_ctx *ctx, json_t *root,handle_merge (&chain->handle, &h);return cmd_alloc (op, obj, &h, int_loc, chain); + +err_free_chain: +chain_free (chain); +handle_free (&h); +return NULL ; } static struct cmd *json_parse_cmd_add_rule(struct json_ctx *ctx, json_t *root,
@@ -3236,6 +3238,7 @@ static struct cmd *json_parse_cmd_add_rule(struct json_ctx *ctx, json_t *root,if (!json_is_array (tmp)) {json_error (ctx,"Value of property \"expr\" must be an array." ); +handle_free (&h);return NULL ; }
@@ -3255,16 +3258,14 @@ static struct cmd *json_parse_cmd_add_rule(struct json_ctx *ctx, json_t *root,if (!json_is_object (value)) {json_error (ctx,"Unexpected expr array element of type %s, expected object." ,json_typename (value)); -rule_free (rule); -return NULL ; + goto err_free_rule; } stmt =json_parse_stmt (ctx, value);if (!stmt) {json_error (ctx,"Parsing expr array at index %zd failed." , index); -rule_free (rule); -return NULL ; + goto err_free_rule; }rule_stmt_append (rule, stmt);
@@ -3274,6 +3275,11 @@ static struct cmd *json_parse_cmd_add_rule(struct json_ctx *ctx, json_t *root,json_object_del (root,"handle" );return cmd_alloc (op, obj, &h, int_loc, rule); + +err_free_rule: +rule_free (rule); +handle_free (&h); +return NULL ; }static int string_to_nft_object (const char *str)
@@ -3654,8 +3660,7 @@ static struct cmd *json_parse_cmd_add_object(struct json_ctx *ctx,if (ret <0 || ret >= (int )sizeof (obj->secmark.ctx)) {json_error (ctx,"Invalid secmark context '%s', max length is %zu." , tmp,sizeof (obj->secmark.ctx)); -obj_free (obj); -return NULL ; + goto err_free_obj; } }break ;
@@ -3671,8 +3676,7 @@ static struct cmd *json_parse_cmd_add_object(struct json_ctx *ctx, ret >= (int)sizeof(obj->ct_helper.name)) {json_error (ctx,"Invalid CT helper type '%s', max length is %zu." , tmp,sizeof (obj->ct_helper.name)); -obj_free (obj); -return NULL ; + goto err_free_obj; } }if (!json_unpack (root,"{s:s}" ,"protocol" , &tmp)) {
@@ -3682,15 +3686,13 @@ static struct cmd *json_parse_cmd_add_object(struct json_ctx *ctx, obj->ct_helper.l4proto =IPPROTO_UDP ; }else {json_error (ctx,"Invalid ct helper protocol '%s'." , tmp); -obj_free (obj); -return NULL ; + goto err_free_obj; } }if (!json_unpack (root,"{s:s}" ,"l3proto" , &tmp) &&parse_family (tmp, &l3proto)) {json_error (ctx,"Invalid ct helper l3proto '%s'." , tmp); -obj_free (obj); -return NULL ; + goto err_free_obj; } obj->ct_helper.l3proto = l3proto;break ;
@@ -3704,23 +3706,19 @@ static struct cmd *json_parse_cmd_add_object(struct json_ctx *ctx, obj->ct_timeout.l4proto =IPPROTO_UDP ; }else {json_error (ctx,"Invalid ct timeout protocol '%s'." , tmp); -obj_free (obj); -return NULL ; + goto err_free_obj; } }if (!json_unpack (root,"{s:s}" ,"l3proto" , &tmp) &&parse_family (tmp, &l3proto)) {json_error (ctx,"Invalid ct timeout l3proto '%s'." , tmp); -obj_free (obj); -return NULL ; + goto err_free_obj; } obj->ct_timeout.l3proto = l3proto;init_list_head (&obj->ct_timeout.timeout_list); -if (json_parse_ct_timeout_policy (ctx, root, obj)) { -obj_free (obj); -return NULL ; - } +if (json_parse_ct_timeout_policy (ctx, root, obj)) + goto err_free_obj;break ;case NFT_OBJECT_CT_EXPECT : cmd_obj =CMD_OBJ_CT_EXPECT ;
@@ -3728,8 +3726,7 @@ static struct cmd *json_parse_cmd_add_object(struct json_ctx *ctx,if (!json_unpack (root,"{s:s}" ,"l3proto" , &tmp) &&parse_family (tmp, &l3proto)) {json_error (ctx,"Invalid ct expectation l3proto '%s'." , tmp); -obj_free (obj); -return NULL ; + goto err_free_obj; } obj->ct_expect.l3proto = l3proto;if (!json_unpack (root,"{s:s}" ,"protocol" , &tmp)) {
@@ -3739,8 +3736,7 @@ static struct cmd *json_parse_cmd_add_object(struct json_ctx *ctx, obj->ct_expect.l4proto =IPPROTO_UDP ; }else {json_error (ctx,"Invalid ct expectation protocol '%s'." , tmp); -obj_free (obj); -return NULL ; + goto err_free_obj; } }if (!json_unpack (root,"{s:i}" ,"dport" , &i))
@@ -3754,10 +3750,9 @@ static struct cmd *json_parse_cmd_add_object(struct json_ctx *ctx, obj->type =NFT_OBJECT_LIMIT ;if (json_unpack_err (ctx, root,"{s:I, s:s}" ,"rate" , &obj->limit.rate, -"per" , &tmp)) { -obj_free (obj); -return NULL ; - } +"per" , &tmp)) + goto err_free_obj; +json_unpack (root,"{s:s}" ,"rate_unit" , &rate_unit);json_unpack (root,"{s:b}" ,"inv" , &inv);json_unpack (root,"{s:i}" ,"burst" , &obj->limit.burst);
@@ -3778,20 +3773,18 @@ static struct cmd *json_parse_cmd_add_object(struct json_ctx *ctx,case CMD_OBJ_SYNPROXY : obj->type =NFT_OBJECT_SYNPROXY ;if (json_unpack_err (ctx, root,"{s:i, s:i}" , -"mss" , &i,"wscale" , &j)) { -obj_free (obj); -return NULL ; - } +"mss" , &i,"wscale" , &j)) + goto err_free_obj; + obj->synproxy.mss = i; obj->synproxy.wscale = j; obj->synproxy.flags |=NF_SYNPROXY_OPT_MSS ; obj->synproxy.flags |=NF_SYNPROXY_OPT_WSCALE ;if (!json_unpack (root,"{s:o}" ,"flags" , &jflags)) { flags =json_parse_synproxy_flags (ctx, jflags); -if (flags <0 ) { -obj_free (obj); -return NULL ; - } +if (flags <0 ) + goto err_free_obj; + obj->synproxy.flags |= flags; }break ;
@@ -3803,6 +3796,11 @@ static struct cmd *json_parse_cmd_add_object(struct json_ctx *ctx,json_object_del (root,"handle" );return cmd_alloc (op, cmd_obj, &h, int_loc, obj); + +err_free_obj: +obj_free (obj); +handle_free (&h); +return NULL ; } static struct cmd *json_parse_cmd_add(struct json_ctx *ctx,
@@ -3917,8 +3915,7 @@ static struct cmd *json_parse_cmd_replace(struct json_ctx *ctx,if (!json_is_object (value)) {json_error (ctx,"Unexpected expr array element of type %s, expected object." ,json_typename (value)); -rule_free (rule); -return NULL ; + goto err_free_replace; } stmt =json_parse_stmt (ctx, value);
@@ -3926,8 +3923,7 @@ static struct cmd *json_parse_cmd_replace(struct json_ctx *ctx,if (!stmt) {json_error (ctx,"Parsing expr array at index %zd failed." , index); -rule_free (rule); -return NULL ; + goto err_free_replace; }rule_stmt_append (rule, stmt);
@@ -3937,6 +3933,11 @@ static struct cmd *json_parse_cmd_replace(struct json_ctx *ctx,json_object_del (root,"handle" );return cmd_alloc (op,CMD_OBJ_RULE , &h, int_loc, rule); + +err_free_replace: +rule_free (rule); +handle_free (&h); +return NULL ; } static struct cmd *json_parse_cmd_list_multiple(struct json_ctx *ctx,
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 4/4 parser_json: fix crash in json_parse_set_stmt_list
In reply to Pablo Neira AyusoFrom: "Sebastian Walz (sivizius)" <[email protected]>
Due to missing NULL-check, there will be a segfault for invalid statements.
--- src/parser_json.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
src/parser_json.c +9 -4
@@ -2380,7 +2380,7 @@ static void json_parse_set_stmt_list(struct json_ctx *ctx, json_t *stmt_json) {struct list_head *head; -struct stmt *tmp; +struct stmt *stmt;json_t *value;size_t index;
@@ -2392,9 +2392,14 @@ static void json_parse_set_stmt_list(struct json_ctx *ctx, head = stmt_list; json_array_foreach(stmt_json, index, value) { - tmp =json_parse_stmt (ctx, value); -list_add (&tmp->list, head); - head = &tmp->list; + stmt =json_parse_stmt (ctx, value); +if (!stmt) { +json_error (ctx,"Parsing set statements array at index %zd failed." , index); +stmt_list_free (stmt_list); +return ; + } +list_add (&stmt->list, head); + head = &stmt->list; } }
Signature · 1 line
2.30.2