wonderful-mobile/exynos-linux-stable
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ring-buffer: Fix return value check in test_ringbuffer()

Browse source 
commit 62277de758b155dc04b78f195a1cb5208c37b2df upstream.

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/1466184839-14927-1-git-send-email-weiyj_lk@163.com

Fixes: 6c43e554a ("ring-buffer: Add ring buffer startup selftest")
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Wei Yongjun 2016-06-17 17:33:59 +00:00 • committed by Greg Kroah-Hartman
parent f7db18998e
commit 703cebf6e9
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kernel/trace/ring_buffer.c
View file

@ -4870,9 +4870,9 @@ static __init int test_ringbuffer(void)
rb_data[cpu].cnt = cpu; rb_data[cpu].cnt = cpu;
rb_threads[cpu] = kthread_create(rb_test, &rb_data[cpu], rb_threads[cpu] = kthread_create(rb_test, &rb_data[cpu],
"rbtester/%d", cpu); "rbtester/%d", cpu);
if (WARN_ON(!rb_threads[cpu])) { if (WARN_ON(IS_ERR(rb_threads[cpu]))) {
pr_cont("FAILED\n"); pr_cont("FAILED\n");
ret = -1; ret = PTR_ERR(rb_threads[cpu]);
goto out_free; goto out_free;
} }
@ -4882,9 +4882,9 @@ static __init int test_ringbuffer(void)
/* Now create the rb hammer! */ /* Now create the rb hammer! */
rb_hammer = kthread_run(rb_hammer_test, NULL, "rbhammer"); rb_hammer = kthread_run(rb_hammer_test, NULL, "rbhammer");
if (WARN_ON(!rb_hammer)) { if (WARN_ON(IS_ERR(rb_hammer))) {
pr_cont("FAILED\n"); pr_cont("FAILED\n");
ret = -1; ret = PTR_ERR(rb_hammer);
goto out_free; goto out_free;
} }