futex: Fix locking imbalance
commit627376bd3503801263df2ac2df6d5685026bb231
authorThomas Gleixner <tglx@linutronix.de>
Sun, 4 Oct 2009 07:34:17 +0000 (4 09:34 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 12 Oct 2009 19:40:11 +0000 (12 12:40 -0700)
treeeb5d7ce260c01daf9e093d18c5812e0867cd60a7
parent1c4dacc248f10d641c9ea3a65a8d260d28732e6e
futex: Fix locking imbalance

commit eaaea8036d0261d87d7072c5bc88c7ea730c18ac upstream.

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>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
kernel/futex.c