From: john stultz <johnstul@us.ibm.com>
Date: Wed, 22 Aug 2007 21:01:10 +0000 (-0700)
Subject: futex_unlock_pi() hurts my brain and may cause application deadlock
X-Git-Tag: v2.6.23-rc4~84
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=187226f57f1381cfc63216979b4375f30e593795;p=linux-2.6-omap-h63xx.git

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>
---

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;
 	}