summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2010-10-17 08:35:04 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-11-22 10:47:31 -0800
commit183308db7612a1b46a2b6355e83d93a4a8950771 (patch)
treebd2d66708f5b52c6f49f52de7c079936692dc959 /arch/x86
parent3502405eb88b9086acd4fe1dc5113122a19a2bb8 (diff)
futex: Fix errors in nested key ref-counting
commit 7ada876a8703f23befbb20a7465a702ee39b1704 upstream. futex_wait() is leaking key references due to futex_wait_setup() acquiring an additional reference via the queue_lock() routine. The nested key ref-counting has been masking bugs and complicating code analysis. queue_lock() is only called with a previously ref-counted key, so remove the additional ref-counting from the queue_(un)lock() functions. Also futex_wait_requeue_pi() drops one key reference too many in unqueue_me_pi(). Remove the key reference handling from unqueue_me_pi(). This was paired with a queue_lock() in futex_lock_pi(), so the count remains unchanged. Document remaining nested key ref-counting sites. Signed-off-by: Darren Hart <dvhart@linux.intel.com> Reported-and-tested-by: Matthieu Fertré<matthieu.fertre@kerlabs.com> Reported-by: Louis Rilling<louis.rilling@kerlabs.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Eric Dumazet <eric.dumazet@gmail.com> Cc: John Kacur <jkacur@redhat.com> Cc: Rusty Russell <rusty@rustcorp.com.au> LKML-Reference: <4CBB17A8.70401@linux.intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions