]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
tracing: Fix return value check in trace_benchmark_reg()
authorWei Yongjun <weiyongjun1@huawei.com>
Thu, 12 Jan 2017 13:55:02 +0000 (13:55 +0000)
committerSteven Rostedt (VMware) <rostedt@goodmis.org>
Wed, 15 Feb 2017 14:02:27 +0000 (09:02 -0500)
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>
kernel/trace/trace_benchmark.c

index e3b488825ae3770239639cebf1e322807c48cff5..e49fbe901cfc64c60734d52a0a7c8db320606b00 100644 (file)
@@ -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;