diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2015-11-15 20:33:11 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-11-23 09:48:17 +0100 |
| commit | 64038f292a1b33c7d46bd11f62f7798101152c00 (patch) | |
| tree | 9fe0f8f62d272a6356e22ba154ba4878f7c32506 /kernel/stop_machine.c | |
| parent | 01783e0d452736d7deff1b920c5eccad67adc428 (diff) | |
| download | linux-stable-64038f292a1b33c7d46bd11f62f7798101152c00.tar.gz linux-stable-64038f292a1b33c7d46bd11f62f7798101152c00.tar.bz2 linux-stable-64038f292a1b33c7d46bd11f62f7798101152c00.zip | |
stop_machine: Fix possible cpu_stopper_thread() crash
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>
Diffstat (limited to 'kernel/stop_machine.c')
| -rw-r--r-- | kernel/stop_machine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index 867bc20e1ef1..1a66a9569915 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c @@ -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 */ |