diff options
| author | Darren Hart <dvhltc@us.ibm.com> | 2009-10-07 11:46:54 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-10-12 12:40:10 -0700 |
| commit | 9cb696b8f6a4b034d2a0323aaf81a878c60199a5 (patch) | |
| tree | 0335733495a9a317bcbf7064869e2da8a772351b | |
| parent | 1afc593a47447345649bc850a07b0741b8aa3caf (diff) | |
| download | lwn-9cb696b8f6a4b034d2a0323aaf81a878c60199a5.tar.gz lwn-9cb696b8f6a4b034d2a0323aaf81a878c60199a5.zip | |
futex: fix requeue_pi key imbalance
commit da085681014fb43d67d9bf6d14bc068e9254bd49 upstream.
If futex_wait_requeue_pi() wakes prior to requeue, we drop the
reference to the source futex_key twice, once in
handle_early_requeue_pi_wakeup() and once on our way out.
Remove the drop from the handle_early_requeue_pi_wakeup() and keep
the get/drops together in futex_wait_requeue_pi().
Reported-by: Helge Bahmann <hcb@chaoticmind.net>
Signed-off-by: Darren Hart <dvhltc@us.ibm.com>
Cc: Helge Bahmann <hcb@chaoticmind.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Dinakar Guniguntala <dino@in.ibm.com>
Cc: John Stultz <johnstul@us.ibm.com>
LKML-Reference: <4ACCE21E.5030805@us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | kernel/futex.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index e18cfbdc7190..7a2994d59e69 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -2087,7 +2087,6 @@ int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb, * Unqueue the futex_q and determine which it was. */ plist_del(&q->list, &q->list.plist); - drop_futex_key_refs(&q->key); if (timeout && !timeout->task) ret = -ETIMEDOUT; |