diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2012-07-20 11:53:30 -0700 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2012-10-07 23:38:15 +0200 |
| commit | 9246af14306ceadab0feb28ff2954416970b7465 (patch) | |
| tree | 79d0ef693e108b72937b40941fe90593b18b2be0 /kernel | |
| parent | 51ed259979b8640172ccc88c848dcf9f887a9538 (diff) | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
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 6f745b6cfb1..7fd3dace804 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -2318,7 +2318,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, int fshared, * 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); |