Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1400332

[PATCH 07/10] tools lib traceevent: Do not reassign parg after collapse_tree()

Show all headers | View raw

From: Steven Rostedt <rostedt@goodmis.org>

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>
---
 tools/lib/traceevent/parse-filter.c | 4 ++--
 1 file 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;
-
 	free(token);
 	return 0;
 
-- 
2.5.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 00/10] perf/urgent fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-12 22:10 +0200
  [PATCH 04/10] perf tools: Use readdir() instead of deprecated readdir_r() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-12 22:10 +0200
  [PATCH 07/10] tools lib traceevent: Do not reassign parg after collapse_tree() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-12 22:10 +0200
  [PATCH 08/10] perf evsel: Improve EPERM error handling in open_strerror() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-12 22:10 +0200
  [PATCH 09/10] perf evsel: Handle EACCESS + perf_event_paranoid=2 in fallback() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-12 22:10 +0200
  [PATCH 10/10] perf stat: Fallback to user only counters when perf_event_paranoid > 1 Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-12 22:10 +0200
  [PATCH 02/10] perf script: Use readdir() instead of deprecated readdir_r() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-12 22:10 +0200
  [PATCH 01/10] perf tools: Use readdir() instead of deprecated readdir_r() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-12 22:10 +0200
  [PATCH 03/10] perf thread_map: Use readdir() instead of deprecated readdir_r() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-12 22:10 +0200
  [PATCH 06/10] perf probe: Check if dwarf_getlocations() is available Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-12 22:10 +0200
    Re: [PATCH 06/10] perf probe: Check if dwarf_getlocations() is  available Masami Hiramatsu <mhiramat@kernel.org> - 2016-05-13 04:40 +0200
      Re: [PATCH 06/10] perf probe: Check if dwarf_getlocations() is  available Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-13 13:50 +0200
  Re: [GIT PULL 00/10] perf/urgent fixes Ingo Molnar <mingo@kernel.org> - 2016-05-13 07:40 +0200

csiph-web