| From 55be1a149c03a8d84fafdfa441551695260c4082 Mon Sep 17 00:00:00 2001 |
| From: Darren Hart <dvhart@linux.intel.com> |
| Date: Fri, 20 Jul 2012 11:53:29 -0700 |
| Subject: [PATCH] futex: Test for pi_mutex on fault in futex_wait_requeue_pi() |
| |
| commit b6070a8d9853eda010a549fa9a09eb8d7269b929 upstream. |
| |
| 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> |
| Link: http://lkml.kernel.org/r/dc59890338fc413606f04e5c5b131530734dae3d.1342809673.git.dvhart@linux.intel.com |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| kernel/futex.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/kernel/futex.c b/kernel/futex.c |
| index d4e7f0ea1f94..0e8043833223 100644 |
| --- a/kernel/futex.c |
| +++ b/kernel/futex.c |
| @@ -2348,7 +2348,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, int fshared, |
| * 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.8.5.2 |
| |