Skip to content

Commit

Permalink
stop_machine: Fix possible cpu_stopper_thread() crash
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
oleg-nesterov authored and Ingo Molnar committed Nov 23, 2015
1 parent 01783e0 commit 64038f2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kernel/stop_machine.c
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ static void cpu_stopper_thread(unsigned int cpu)
preempt_disable();

ret = fn(arg);
if (ret)
if (ret && done)
done->ret = ret;

/* restore preemption and check it's still balanced */
Expand Down

0 comments on commit 64038f2

Please sign in to comment.