]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
stop_machine: Fix possible cpu_stopper_thread() crash
authorOleg Nesterov <oleg@redhat.com>
Sun, 15 Nov 2015 19:33:11 +0000 (20:33 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 23 Nov 2015 08:48:17 +0000 (09:48 +0100)
stop_one_cpu_nowait(fn) will crash the kernel if the callback returns
nonzero, work->done == NULL in this case.

This needs more cleanups, cpu_stop_signal_done() is called right after
we check done != NULL and it does the same check.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Tejun Heo <tj@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Milos Vyletel <milos@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20151115193311.GA8242@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/stop_machine.c

index 867bc20e1ef142a63349c345932af24b26a1adfc..1a66a95699151005f5976070b3a65497028d6ac6 100644 (file)
@@ -454,7 +454,7 @@ repeat:
                preempt_disable();
 
                ret = fn(arg);
-               if (ret)
+               if (ret && done)
                        done->ret = ret;
 
                /* restore preemption and check it's still balanced */