diff options
| author | Namhyung Kim <[email protected]> | 2012-05-23 11:36:49 +0900 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <[email protected]> | 2012-05-24 11:33:34 -0300 |
| commit | d1de10870909a27ce2ac380d0671feb308826491 (patch) | |
| tree | 4640ef6e16c2013edff652193d6d531a7067e600 | |
| parent | 57d34dc5568f6ac700ef7e5c67f2bd6a8c7c4659 (diff) | |
tools lib traceevent: Fix a possibly wrong memory dereference
If set_op_prio() failed, the token will be freed at out_free,
then arg->op.op would turn out to be a dangle pointer. After
returning EVENT_ERROR from process_op(), free_arg() will be
called and then it will finally see the dangling pointer.
Cc: Borislav Petkov <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Namhyung Kim <[email protected]>
Signed-off-by: Steven Rostedt <[email protected]>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
| -rw-r--r-- | tools/lib/traceevent/event-parse.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index d598b376e3c1..445a43ad42fd 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -1715,6 +1715,8 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok) if (set_op_prio(arg) == -1) { event->flags |= EVENT_FL_FAILED; + /* arg->op.op (= token) will be freed at out_free */ + arg->op.op = NULL; goto out_free; } |