diff options
| author | Tzvetomir Stoyanov <tstoyanov@vmware.com> | 2018-11-28 14:55:52 -0500 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-12-17 14:55:19 -0300 |
| commit | 44e92f8389b2242efde77d5321ffa88decd47df6 (patch) | |
| tree | 6701602f671f8ef1115c1163406d0aa9722fdfb7 /tools/lib/traceevent/event-parse.c | |
| parent | a1c8cf293d57cb7c952b667805441b9fbb9c640a (diff) | |
| download | linux-44e92f8389b2242efde77d5321ffa88decd47df6.tar.gz linux-44e92f8389b2242efde77d5321ffa88decd47df6.tar.bz2 linux-44e92f8389b2242efde77d5321ffa88decd47df6.zip | |
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>
Diffstat (limited to 'tools/lib/traceevent/event-parse.c')
| -rw-r--r-- | tools/lib/traceevent/event-parse.c | 2 |
1 files changed, 1 insertions, 1 deletions
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") |