Commit 106b816c authored May 11, 2016 by Steven Rostedt Committed by Arnaldo Carvalho de Melo May 12, 2016

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: 42d6194d ("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>

parent 49247345

tools/lib/traceevent/parse-filter.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;