lkml.org 
[lkml]   [2012]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 48/49] futex: Fix bug in WARN_ON for NULL q.pi_state
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.0-stable review patch. If anyone has any objections, please let me know.

    ------------------

    From: Darren Hart <dvhart@linux.intel.com>

    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>

    ---
    kernel/futex.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/kernel/futex.c
    +++ b/kernel/futex.c
    @@ -2343,7 +2343,7 @@ static int futex_wait_requeue_pi(u32 __u
    * 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);



    \
     
     \ /
      Last update: 2012-08-08 01:42    [W:4.140 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site