|
 |
bacbc8 |
From 5a6bcfe9e3d323e9503383601234fde3f3cf4a0b Mon Sep 17 00:00:00 2001
|
|
|
bacbc8 |
From: Phil Sutter <phil@nwl.cc>
|
|
|
bacbc8 |
Date: Tue, 26 Feb 2019 22:13:39 +0100
|
|
|
bacbc8 |
Subject: [PATCH] parser_json: Duplicate chain name when parsing jump verdict
|
|
|
bacbc8 |
|
|
|
bacbc8 |
Since verdict expression frees the chain name, pass a newly allocated
|
|
|
bacbc8 |
string to it. Otherwise double free happens because json_decref() frees
|
|
|
bacbc8 |
the string property value as well.
|
|
|
bacbc8 |
|
|
|
bacbc8 |
Fixes: d1057a5feb5fd ("JSON: Simplify verdict statement parsing")
|
|
|
bacbc8 |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
bacbc8 |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
bacbc8 |
(cherry picked from commit dc6a6e83b47fc7078a061350cd2b111cb2adec14)
|
|
|
bacbc8 |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
bacbc8 |
---
|
|
|
bacbc8 |
src/parser_json.c | 3 ++-
|
|
|
bacbc8 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
bacbc8 |
|
|
|
bacbc8 |
diff --git a/src/parser_json.c b/src/parser_json.c
|
|
|
bacbc8 |
index e3f20ae51c764..688fac1bddde2 100644
|
|
|
bacbc8 |
--- a/src/parser_json.c
|
|
|
bacbc8 |
+++ b/src/parser_json.c
|
|
|
bacbc8 |
@@ -1028,7 +1028,8 @@ static struct expr *json_parse_verdict_expr(struct json_ctx *ctx,
|
|
|
bacbc8 |
return NULL;
|
|
|
bacbc8 |
|
|
|
bacbc8 |
return verdict_expr_alloc(int_loc,
|
|
|
bacbc8 |
- verdict_tbl[i].verdict, chain);
|
|
|
bacbc8 |
+ verdict_tbl[i].verdict,
|
|
|
bacbc8 |
+ chain ? xstrdup(chain) : NULL);
|
|
|
bacbc8 |
}
|
|
|
bacbc8 |
json_error(ctx, "Unknown verdict '%s'.", type);
|
|
|
bacbc8 |
return NULL;
|
|
|
bacbc8 |
--
|
|
|
bacbc8 |
2.21.0
|
|
|
bacbc8 |
|