From: tip-bot for Tzvetomir Stoyanov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: rostedt@goodmis.org, tstoyanov@vmware.com,
linux-kernel@vger.kernel.org, kaslevs@vmware.com,
tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org,
jolsa@redhat.com, acme@redhat.com
Subject: [tip:perf/core] tools lib traceevent: Add sanity check to is_timestamp_in_us()
Date: Fri, 14 Dec 2018 12:31:21 -0800 [thread overview]
Message-ID: <tip-51d0337d01985d0cccb6e41f976cc0dbe921fd84@git.kernel.org> (raw)
In-Reply-To: <20181128145552.68c4f87b@gandalf.local.home>
Commit-ID: 51d0337d01985d0cccb6e41f976cc0dbe921fd84
Gitweb: https://git.kernel.org/tip/51d0337d01985d0cccb6e41f976cc0dbe921fd84
Author: Tzvetomir Stoyanov <tstoyanov@vmware.com>
AuthorDate: Wed, 28 Nov 2018 14:55:52 -0500
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 29 Nov 2018 20:42:50 -0300
tools lib traceevent: Add sanity check to is_timestamp_in_us()
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@vmware.com>
Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/20181128145552.68c4f87b@gandalf.local.home
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
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 fbd6d6813fab..2b5cb33046ce 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")
next prev parent reply other threads:[~2018-12-14 20:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-28 19:55 [PATCH] tools/lib/traceevent: Add sanity check to is_timestamp_in_us() Steven Rostedt
2018-12-14 20:31 ` tip-bot for Tzvetomir Stoyanov [this message]
2018-12-18 13:58 ` [tip:perf/core] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-51d0337d01985d0cccb6e41f976cc0dbe921fd84@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=kaslevs@vmware.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=tstoyanov@vmware.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox