diff options
| author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2016-04-25 21:01:27 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2016-04-26 15:40:29 +0200 |
| commit | 432480c58219eff32904b879eb3fcc1d268a3b06 (patch) | |
| tree | 7a17b0d60cf46505700983b8a020b3edabc18831 /kernel/trace | |
| parent | tracing: checking for NULL instead of IS_ERR() (diff) | |
| download | linux-432480c58219eff32904b879eb3fcc1d268a3b06.tar.xz linux-432480c58219eff32904b879eb3fcc1d268a3b06.zip | |
tracing: Add check for NULL event field when creating hist field
Smatch flagged create_hist_field() as possibly being able to
dereference a NULL pointer, although the current code exits in all
cases where the event field could be NULL, so it's not actually a
problem.
Still, to prevent future changes to the code from overlooking new
cases, make the NULL pointer check explicit and warn once in that
case.
Link: http://lkml.kernel.org/r/cfbc003f534a3e441b4313272fd412310aba6336.1461610073.git.tom.zanussi@linux.intel.com
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_events_hist.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index f98b6b3a2804..0c05b8a99806 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -371,6 +371,9 @@ static struct hist_field *create_hist_field(struct ftrace_event_field *field, goto out; } + if (WARN_ON_ONCE(!field)) + goto out; + if (is_string_field(field)) { flags |= HIST_FIELD_FL_STRING; |