diff options
| author | Steven Rostedt (VMware) | 2017-06-29 10:05:45 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) | 2017-06-29 10:05:45 -0400 |
| commit | 0f17976568b3f72e676450af0c0db6f8752253d6 (patch) | |
| tree | 6bd68d4113163f5205b7ee89a36b162e92b13d20 /kernel/trace/trace.c | |
| parent | 32c1431eea4881a6b17bd7c639315010aeefa452 (diff) | |
ftrace: Fix regression with module command in stack_trace_filter
When doing the following command:
# echo ":mod:kvm_intel" > /sys/kernel/tracing/stack_trace_filter
it triggered a crash.
This happened with the clean up of probes. It required all callers to the
regex function (doing ftrace filtering) to have ops->private be a pointer to
a trace_array. But for the stack tracer, that is not the case.
Allow for the ops->private to be NULL, and change the function command
callbacks to handle the trace_array pointer being NULL as well.
Fixes: d2afd57a4b96 ("tracing/ftrace: Allow instances to have their own function probes")
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 1122f151466f..091e801145c9 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6881,6 +6881,9 @@ ftrace_trace_snapshot_callback(struct trace_array *tr, struct ftrace_hash *hash, char *number; int ret; + if (!tr) + return -ENODEV; + /* hash funcs only work with set_ftrace_filter */ if (!enable) return -EINVAL; |