futex: Fix locking imbalance
authorThomas Gleixner <tglx@linutronix.de>
Sun, 4 Oct 2009 07:34:17 +0000 (09:34 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 5 Oct 2009 19:08:14 +0000 (21:08 +0200)
commiteaaea8036d0261d87d7072c5bc88c7ea730c18ac
tree07bbd53bdc9a47d86ca667f3171c3b7ebf1ac07c
parentd014e8894dfc523dd9d2f2a17b6dcb94facea810
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.

Reported-by: Rich Ercolany <rercola@acm.jhu.edu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Darren Hart <dvhltc@us.ibm.com>
Cc: stable-2.6.31 <stable@kernel.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/futex.c