diff options
| author | Steven Rostedt <rostedt@goodmis.org> | 2016-05-11 15:09:36 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2016-07-12 09:22:52 -0400 |
| commit | 73723c0bb51262715564ebb2a6cf435603779668 (patch) | |
| tree | 2963db641b69e1402b0b72c1b665fe95340bf33d | |
| parent | 64bea4bc31b27f088e38a9f941a0e93c77d5bb18 (diff) | |
| download | trace-cmd-73723c0bb51262715564ebb2a6cf435603779668.tar.gz | |
tools lib traceevent: Do not reassign parg after collapse_tree()
At the end of process_filter(), collapse_tree() was changed to update
the parg parameter, but the reassignment after the call wasn't removed.
What happens is that the "current_op" gets modified and freed and parg
is assigned to the new allocated argument. But after the call to
collapse_tree(), parg is assigned again to the just freed "current_op",
and this causes the tool to crash.
The current_op variable must also be assigned to NULL in case of error,
otherwise it will cause it to be free()ed twice.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: stable@vger.kernel.org # 3.14+
Fixes: 42d6194d133c ("tools lib traceevent: Refactor process_filter()")
Link: http://lkml.kernel.org/r/20160511150936.678c18a1@gandalf.local.home
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | parse-filter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/parse-filter.c b/parse-filter.c index 0144b3d1..88cccea3 100644 --- a/parse-filter.c +++ b/parse-filter.c @@ -1164,11 +1164,11 @@ process_filter(struct event_format *event, struct filter_arg **parg, current_op = current_exp; ret = collapse_tree(current_op, parg, error_str); + /* collapse_tree() may free current_op, and updates parg accordingly */ + current_op = NULL; if (ret < 0) goto fail; - *parg = current_op; - free(token); return 0; |