lkml.org 
[lkml]   [2012]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/4] tools lib traceevent: Make sure that arg->op.right is set properly
Date
From: Namhyung Kim <namhyung.kim@lge.com>

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>
---
tools/lib/traceevent/event-parse.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 11f76a59711f..bc4e70e3ba29 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -1772,6 +1772,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
arg->op.left = left;
arg->op.prio = 0;

+ /* it will set arg->op.right */
type = process_cond(event, arg, tok);

} else if (strcmp(token, ">>") == 0 ||
@@ -1802,6 +1803,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
arg->type = PRINT_OP;
arg->op.op = token;
arg->op.left = left;
+ arg->op.right = NULL;

if (set_op_prio(arg) == -1) {
event->flags |= EVENT_FL_FAILED;
@@ -1859,6 +1861,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)

arg->op.prio = 0;

+ /* it will set arg->op.right */
type = process_array(event, arg, tok);

} else {
--
1.7.11.4


\
 
 \ /
  Last update: 2012-09-19 10:01    [W:0.070 / U:2.744 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site