diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 20:07:38 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-02-13 10:34:05 +0000 |
| commit | 58467344684846506b9d95d32a2af7b818b4a885 (patch) | |
| tree | dc2161a57c093b5ff35e5e742e040642cda90cb6 /kernel | |
| parent | 27d5e195aa0e49927dc65213be3d2ab69d21f797 (diff) | |
| download | linux-58467344684846506b9d95d32a2af7b818b4a885.tar.gz linux-58467344684846506b9d95d32a2af7b818b4a885.tar.bz2 linux-58467344684846506b9d95d32a2af7b818b4a885.zip | |
futex: Drop refcount if requeue_pi() acquired the rtmutex
commit fb75a4282d0d9a3c7c44d940582c2d226cf3acfb upstream.
If the proxy lock in the requeue loop acquires the rtmutex for a
waiter then it acquired also refcount on the pi_state related to the
futex, but the waiter side does not drop the reference count.
Add the missing free_pi_state() call.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Darren Hart <darren@dvhart.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Bhuvanesh_Surachari@mentor.com
Cc: Andy Lowe <Andy_Lowe@mentor.com>
Link: http://lkml.kernel.org/r/20151219200607.178132067@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/futex.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 74815953f54c..9dc2c7192b2e 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -2492,6 +2492,11 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, if (q.pi_state && (q.pi_state->owner != current)) { spin_lock(q.lock_ptr); ret = fixup_pi_state_owner(uaddr2, &q, current); + /* + * Drop the reference to the pi state which + * the requeue_pi() code acquired for us. + */ + free_pi_state(q.pi_state); spin_unlock(q.lock_ptr); } } else { |