diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-11-17 08:22:18 +1030 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-16 15:09:52 -0800 |
| commit | e14c8bf86350f6c39186a139c5c584a6111b2f01 (patch) | |
| tree | c1e0b08fc5b8efff001aecf5e6fb803423bd1c71 | |
| parent | 5c06fe772da43db63b053addcd2c267f76d0be91 (diff) | |
| download | op-kernel-dev-e14c8bf86350f6c39186a139c5c584a6111b2f01.zip op-kernel-dev-e14c8bf86350f6c39186a139c5c584a6111b2f01.tar.gz | |
stop_machine: fix race with return value (fixes Bug #11989)
Bug #11989: Suspend failure on NForce4-based boards due to chanes in
stop_machine
We should not access active.fnret outside the lock; in theory the next
stop_machine could overwrite it.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Tested-by: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | kernel/stop_machine.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index 9bc4c00..24e8cea 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c @@ -112,7 +112,7 @@ static int chill(void *unused) int __stop_machine(int (*fn)(void *), void *data, const cpumask_t *cpus) { struct work_struct *sm_work; - int i; + int i, ret; /* Set up initial state. */ mutex_lock(&lock); @@ -137,8 +137,9 @@ int __stop_machine(int (*fn)(void *), void *data, const cpumask_t *cpus) /* This will release the thread on our CPU. */ put_cpu(); flush_workqueue(stop_machine_wq); + ret = active.fnret; mutex_unlock(&lock); - return active.fnret; + return ret; } int stop_machine(int (*fn)(void *), void *data, const cpumask_t *cpus) |
