| Message ID | 20190910134615.11742-1-eric@garver.life |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | [nft] parser_json: fix crash on insert rule to bad references | expand |
On Tue, Sep 10, 2019 at 09:46:15AM -0400, Eric Garver wrote: > Pass the location via the handle so the error leg in > erec_print_list() can reference it. Applies to invalid references > to tables, chains, and indexes. > > Fixes: 586ad210368b ("libnftables: Implement JSON parser") > Signed-off-by: Eric Garver <eric@garver.life> Also applied, thanks!
diff --git a/src/parser_json.c b/src/parser_json.c index 8ca07d717b13..183d9c972181 100644 --- a/src/parser_json.c +++ b/src/parser_json.c @@ -3258,7 +3258,11 @@ static struct cmd *json_parse_cmd_add(struct json_ctx *ctx, static struct cmd *json_parse_cmd_replace(struct json_ctx *ctx, json_t *root, enum cmd_ops op) { - struct handle h = { 0 }; + struct handle h = { + .table.location = *int_loc, + .chain.location = *int_loc, + .index.location = *int_loc, + }; json_t *tmp, *value; const char *family; struct rule *rule;
Pass the location via the handle so the error leg in erec_print_list() can reference it. Applies to invalid references to tables, chains, and indexes. Fixes: 586ad210368b ("libnftables: Implement JSON parser") Signed-off-by: Eric Garver <eric@garver.life> --- src/parser_json.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)