Commit b6070a8d authored Jul 20, 2012 by Darren Hart Committed by Thomas Gleixner Jul 24, 2012

futex: Test for pi_mutex on fault in futex_wait_requeue_pi()

If fixup_pi_state_owner() faults, pi_mutex may be NULL. Test
for pi_mutex != NULL before testing the owner against current
and possibly unlocking it.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Dave Jones <davej@redhat.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/dc59890338fc413606f04e5c5b131530734dae3d.1342809673.git.dvhart@linux.intel.com

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 40b3c43f

kernel/futex.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2370,7 +2370,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
		* fault, unlock the rt_mutex and return the fault to userspace.
		*/
		if (ret == -EFAULT) {
		if (rt_mutex_owner(pi_mutex) == current)
		if (pi_mutex && rt_mutex_owner(pi_mutex) == current)
		rt_mutex_unlock(pi_mutex);
		} else if (ret == -EINTR) {
		/*