diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2012-07-20 14:53:29 -0400 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2012-08-13 09:10:40 -0400 |
| commit | 01b3c280b2f55aee50945b964fb9c7befdb4f1ee (patch) | |
| tree | 7ac21f7a9c04f98e01f534b5fe611e33bb109ccb /kernel | |
| parent | d4108173147a914021953159da57589054c0b560 (diff) | |
futex: Test for pi_mutex on fault in futex_wait_requeue_pi()
BugLink: http://bugs.launchpad.net/bugs/1034988
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>
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
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 11e8924b6ee..260e1d6e5f6 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, | |||
| 2370 | * fault, unlock the rt_mutex and return the fault to userspace. | 2370 | * fault, unlock the rt_mutex and return the fault to userspace. |
| 2371 | */ | 2371 | */ |
| 2372 | if (ret == -EFAULT) { | 2372 | if (ret == -EFAULT) { |
| 2373 | if (rt_mutex_owner(pi_mutex) == current) | 2373 | if (pi_mutex && rt_mutex_owner(pi_mutex) == current) |
| 2374 | rt_mutex_unlock(pi_mutex); | 2374 | rt_mutex_unlock(pi_mutex); |
| 2375 | } else if (ret == -EINTR) { | 2375 | } else if (ret == -EINTR) { |
| 2376 | /* | 2376 | /* |