aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorjohn stultz <johnstul@us.ibm.com>2007-08-22 14:01:10 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-22 19:52:44 -0700
commit187226f57f1381cfc63216979b4375f30e593795 (patch)
tree0bda40993e1794363bf6570614584b03f1de55e9 /kernel
parent42b88e6ad4014d290d6b59dfeb5d6949c5a3f346 (diff)
downloadlinux-linaro-187226f57f1381cfc63216979b4375f30e593795.tar.gz
futex_unlock_pi() hurts my brain and may cause application deadlock
Avoid futex_unlock_pi returning -EFAULT (which results in deadlock), by clearing uval before jumping to retry_locked. Signed-off-by: John Stultz <johnstul@us.ibm.com> Acked-by: Steven Rostedt <rostedt@goodmis.org> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/futex.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index 3415e9ad139..e8935b195e8 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1670,6 +1670,7 @@ pi_faulted:
attempt);
if (ret)
goto out;
+ uval = 0;
goto retry_unlocked;
}