summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2017-01-12 13:55:02 +0000
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2017-02-15 09:02:27 -0500
commit8f0994bb8cbde5452e58ce0cacdbf6cb58079d01 (patch)
tree648f3881631818216a871711b9eb014551bccfb6
parenteb583cd484f9a76c3716c0539bd06340943eeff9 (diff)
downloadlinux-stable-8f0994bb8cbde5452e58ce0cacdbf6cb58079d01.tar.gz
linux-stable-8f0994bb8cbde5452e58ce0cacdbf6cb58079d01.tar.bz2
linux-stable-8f0994bb8cbde5452e58ce0cacdbf6cb58079d01.zip
tracing: Fix return value check in trace_benchmark_reg()
In case of error, the function kthread_run() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Link: http://lkml.kernel.org/r/20170112135502.28556-1-weiyj.lk@gmail.com Cc: stable@vger.kernel.org Fixes: 81dc9f0e ("tracing: Add tracepoint benchmark tracepoint") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-rw-r--r--kernel/trace/trace_benchmark.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_benchmark.c b/kernel/trace/trace_benchmark.c
index e3b488825ae3..e49fbe901cfc 100644
--- a/kernel/trace/trace_benchmark.c
+++ b/kernel/trace/trace_benchmark.c
@@ -175,9 +175,9 @@ int trace_benchmark_reg(void)
bm_event_thread = kthread_run(benchmark_event_kthread,
NULL, "event_benchmark");
- if (!bm_event_thread) {
+ if (IS_ERR(bm_event_thread)) {
pr_warning("trace benchmark failed to create kernel thread\n");
- return -ENOMEM;
+ return PTR_ERR(bm_event_thread);
}
return 0;