summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwang, biao <biao.wang@intel.com>2013-05-16 09:50:13 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-07 12:49:13 -0700
commitb6a526aa935210e5a292cd7919fdecf14e240fac (patch)
tree31c9e719639e47f341836c5c5760cda05840c417
parent11e88c5e7bbb812ed25f1e6a8e98d334f0e7dc38 (diff)
klist: del waiter from klist_remove_waiters before wakeup waitting process
commit ac5a2962b02f57dea76d314ef2521a2170b28ab6 upstream. There is a race between klist_remove and klist_release. klist_remove uses a local var waiter saved on stack. When klist_release calls wake_up_process(waiter->process) to wake up the waiter, waiter might run immediately and reuse the stack. Then, klist_release calls list_del(&waiter->list) to change previous wait data and cause prior waiter thread corrupt. The patch fixes it against kernel 3.9. Signed-off-by: wang, biao <biao.wang@intel.com> Acked-by: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--lib/klist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/klist.c b/lib/klist.c
index 0874e41609a6..358a368a2947 100644
--- a/lib/klist.c
+++ b/lib/klist.c
@@ -193,10 +193,10 @@ static void klist_release(struct kref *kref)
if (waiter->node != n)
continue;
+ list_del(&waiter->list);
waiter->woken = 1;
mb();
wake_up_process(waiter->process);
- list_del(&waiter->list);
}
spin_unlock(&klist_remove_lock);
knode_set_klist(n, NULL);