diff options
authorSteven Rostedt <>2016-05-11 15:09:36 -0400
committerArnaldo Carvalho de Melo <>2016-05-12 11:27:00 -0300
commit106b816cb46ebd87408b4ed99a2e16203114daa6 (patch)
parent4924734570a073049450b11f7c59ce5992b03343 (diff)
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 <> Acked-by: Namhyung Kim <> Cc: # 3.14+ Fixes: 42d6194d133c ("tools lib traceevent: Refactor process_filter()") Link: Signed-off-by: Arnaldo Carvalho de Melo <>
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
index 0144b3d1bb77..88cccea3ca99 100644
--- a/tools/lib/traceevent/parse-filter.c
+++ b/tools/lib/traceevent/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;
return 0;