From: Darren Hart Date: Fri, 20 Jul 2012 18:53:30 +0000 (-0700) Subject: futex: Fix bug in WARN_ON for NULL q.pi_state X-Git-Tag: v3.2.27~46 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ccf9739188a122c229a7839ee0af89c91f26029;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git 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 Cc: Dave Jones Link: http://lkml.kernel.org/r/1c85d97f6e5f79ec389a4ead3e367363c74bd09a.1342809673.git.dvhart@linux.intel.com Signed-off-by: Thomas Gleixner Signed-off-by: Ben Hutchings --- 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);