diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2012-07-20 11:53:29 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-09 08:31:53 -0700 |
| commit | d48c1ba2979634ecbbe344a8bd65035f32777f1b (patch) | |
| tree | 93250aaa96091cfbb3449190b94bba614e223085 /kernel | |
| parent | ef2e080c19599e3d0844f3bc599ee5dd627fc850 (diff) | |
| download | linux-stable-d48c1ba2979634ecbbe344a8bd65035f32777f1b.tar.gz linux-stable-d48c1ba2979634ecbbe344a8bd65035f32777f1b.tar.bz2 linux-stable-d48c1ba2979634ecbbe344a8bd65035f32777f1b.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/futex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index e2b0fb9a0b3b..05018bfe21a7 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) { /* |