Skip to contentSkip to conversation

futex: Fix locking imbalance

tip:core/futexes tip-bot for Thomas Gleixner 1 participant 1 message Oct 4, 2009

lore
Share & tools
lore
#0 lore raw
Commit-ID:  9694d494b7f462bffb86654fabe9e1ec2b2b0c47
Gitweb:     http://git.kernel.org/tip/9694d494b7f462bffb86654fabe9e1ec2b2b0c47
Author:     Thomas Gleixner <[email protected]>
AuthorDate: Sun, 4 Oct 2009 09:34:17 +0200
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Sun, 4 Oct 2009 09:46:56 +0200

futex: Fix locking imbalance

Rich reported a lock imbalance in the futex code.
(http://bugzilla.kernel.org/show_bug.cgi?id=14288)

It's caused by the displacement of the retry_private label in futex_wake_op(). The code unlocks the hash bucket locks in the error handling path and retries without locking them again which makes the next unlock fail.

Move retry_private so we lock the hash bucket locks when we retry.

LKML-Reference: <new-submission>
Cc: Ingo Molnar <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Darren Hart <[email protected]>
Cc: stable-2.6.31 <[email protected]>

---
 kernel/futex.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/futex.c +1 -1
index b911adc..a2f7538 100644
@@ -916,8 +916,8 @@ retry:
 	hb1 = hash_futex(&key1);
 	hb2 = hash_futex(&key2);
 
-	double_lock_hb(hb1, hb2);
 retry_private:
+	double_lock_hb(hb1, hb2);
 	op_ret = futex_atomic_op_inuser(op, uaddr2);
 	if (unlikely(op_ret < 0)) {