Skip to content

Commit 5cc2447

Browse files
Wei Yongjungregkh
authored andcommitted
ring-buffer: Fix return value check in test_ringbuffer()
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: 6c43e55 ("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>
1 parent 926e1ed commit 5cc2447

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

kernel/trace/ring_buffer.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4875,9 +4875,9 @@ static __init int test_ringbuffer(void)
48754875
rb_data[cpu].cnt = cpu;
48764876
rb_threads[cpu] = kthread_create(rb_test, &rb_data[cpu],
48774877
"rbtester/%d", cpu);
4878-
if (WARN_ON(!rb_threads[cpu])) {
4878+
if (WARN_ON(IS_ERR(rb_threads[cpu]))) {
48794879
pr_cont("FAILED\n");
4880-
ret = -1;
4880+
ret = PTR_ERR(rb_threads[cpu]);
48814881
goto out_free;
48824882
}
48834883

@@ -4887,9 +4887,9 @@ static __init int test_ringbuffer(void)
48874887

48884888
/* Now create the rb hammer! */
48894889
rb_hammer = kthread_run(rb_hammer_test, NULL, "rbhammer");
4890-
if (WARN_ON(!rb_hammer)) {
4890+
if (WARN_ON(IS_ERR(rb_hammer))) {
48914891
pr_cont("FAILED\n");
4892-
ret = -1;
4892+
ret = PTR_ERR(rb_hammer);
48934893
goto out_free;
48944894
}
48954895

0 commit comments

Comments
 (0)