summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2006-07-01 04:35:46 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-01 09:55:57 -0700
commited6f7b10e657b98b4ba89385d02852c8bdf3980e (patch)
treea53bfca204307322400c3fff1e75563233d38dfc /kernel
parenta99e4e413e1ab9f3c567b5519f5557afd786dc62 (diff)
downloadop-kernel-dev-ed6f7b10e657b98b4ba89385d02852c8bdf3980e.zip
op-kernel-dev-ed6f7b10e657b98b4ba89385d02852c8bdf3980e.tar.gz
[PATCH] pi-futex: futex_wake() lockup fix
Fix futex_wake() exit condition bug when handling the robust-list with PI futexes on them. (reported by Ulrich Drepper, debugged by the lock validator.) Signed-off-by: Ingo Molnar <mingo@elte.hu> Cc: Ulrich Drepper <drepper@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/futex.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index 22aa3c1..15caf93 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -630,8 +630,10 @@ static int futex_wake(u32 __user *uaddr, int nr_wake)
list_for_each_entry_safe(this, next, head, list) {
if (match_futex (&this->key, &key)) {
- if (this->pi_state)
- return -EINVAL;
+ if (this->pi_state) {
+ ret = -EINVAL;
+ break;
+ }
wake_futex(this);
if (++ret >= nr_wake)
break;
OpenPOWER on IntegriCloud