[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20181128145552.68c4f87b@gandalf.local.home>
Date: Wed, 28 Nov 2018 14:55:52 -0500
From: Steven Rostedt <rostedt@...dmis.org>
To: LKML <linux-kernel@...r.kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@...nel.org>,
Jiri Olsa <jolsa@...hat.com>, Ingo Molnar <mingo@...nel.org>,
Tzvetomir Stoyanov <tstoyanov@...are.com>,
Slavomir Kaslev <kaslevs@...are.com>
Subject: [PATCH] tools/lib/traceevent: Add sanity check to
is_timestamp_in_us()
From: Tzvetomir Stoyanov <tstoyanov@...are.com>
This patch adds a sanity check to is_timestamp_in_us() input
parameter trace_clock. It avoids a potential segfault in this
function for the case trace_clock is NULL.
Reported-by: Slavomir Kaslev <kaslevs@...are.com>
Signed-off-by: Tzvetomir Stoyanov <tstoyanov@...are.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@...dmis.org>
---
tools/lib/traceevent/event-parse.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 3692f29fee46..c383305510b4 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -5409,7 +5409,7 @@ void tep_event_info(struct trace_seq *s, struct tep_event_format *event,
static bool is_timestamp_in_us(char *trace_clock, bool use_trace_clock)
{
- if (!use_trace_clock)
+ if (!trace_clock || !use_trace_clock)
return true;
if (!strcmp(trace_clock, "local") || !strcmp(trace_clock, "global")
--
2.19.1
Powered by blists - more mailing lists