iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools lib traceevent: Make sure that arg->op.right is set properly

Browse Source 
When process_op failed, @arg will be freed on a caller with type of
PRINT_OP.  Thus free_arg() will try to free ->op.right field which can
have stale value if something bad happens in the middle.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1348037924-17568-3-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim 2012-09-19 15:58:42 +09:00 committed by Arnaldo Carvalho de Melo
parent 1bce6e0fec
commit 41e51a289b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/lib/traceevent/event-parse.c
View File

@ -1719,6 +1719,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
arg->op.left = left; arg->op.left = left;
arg->op.prio = 0; arg->op.prio = 0;
/* it will set arg->op.right */
type = process_cond(event, arg, tok); type = process_cond(event, arg, tok);
} else if (strcmp(token, ">>") == 0 || } else if (strcmp(token, ">>") == 0 ||
@ -1745,6 +1746,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
arg->type = PRINT_OP; arg->type = PRINT_OP;
arg->op.op = token; arg->op.op = token;
arg->op.left = left; arg->op.left = left;
arg->op.right = NULL;
if (set_op_prio(arg) == -1) { if (set_op_prio(arg) == -1) {
event->flags |= EVENT_FL_FAILED; event->flags |= EVENT_FL_FAILED;
@ -1792,6 +1794,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
arg->op.prio = 0; arg->op.prio = 0;
/* it will set arg->op.right */
type = process_array(event, arg, tok); type = process_array(event, arg, tok);
} else { } else {