Messages in this thread Patch in this message | | | From | Darren Hart <> | Subject | [PATCH 1/3] futex: Test for pi_mutex on fault in futex_wait_requeue_pi | Date | Fri, 20 Jul 2012 11:46:29 -0700 |
| |
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: Thomas Gleixner <tglx@linutronix.de> --- kernel/futex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/futex.c b/kernel/futex.c index e2b0fb9..05018bf 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -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) { /* -- 1.7.10.4
| |