diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2012-07-20 11:53:30 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-08-10 00:24:49 +0100 |
| commit | 4ccf9739188a122c229a7839ee0af89c91f26029 (patch) | |
| tree | 09949d98fd5040fd3755d111779f677976d67f64 /kernel/futex.c | |
| parent | c2da76144f8b38d0a958ff1cd669d5b78e5c3018 (diff) | |
| download | kernel_samsung_smdk4412-4ccf9739188a122c229a7839ee0af89c91f26029.zip kernel_samsung_smdk4412-4ccf9739188a122c229a7839ee0af89c91f26029.tar.gz kernel_samsung_smdk4412-4ccf9739188a122c229a7839ee0af89c91f26029.tar.bz2 | |
futex: Fix bug in WARN_ON for NULL q.pi_state
commit f27071cb7fe3e1d37a9dbe6c0dfc5395cd40fa43 upstream.
The WARN_ON in futex_wait_requeue_pi() for a NULL q.pi_state was testing
the address (&q.pi_state) of the pointer instead of the value
(q.pi_state) of the pointer. Correct it accordingly.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Dave Jones <davej@redhat.com>
Link: http://lkml.kernel.org/r/1c85d97f6e5f79ec389a4ead3e367363c74bd09a.1342809673.git.dvhart@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'kernel/futex.c')
| -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 ed96926..68e817a 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -2343,7 +2343,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, * signal. futex_unlock_pi() will not destroy the lock_ptr nor * the pi_state. */ - WARN_ON(!&q.pi_state); + WARN_ON(!q.pi_state); pi_mutex = &q.pi_state->pi_mutex; ret = rt_mutex_finish_proxy_lock(pi_mutex, to, &rt_waiter, 1); debug_rt_mutex_free_waiter(&rt_waiter); |