lkml.org 
[lkml]   [2012]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/3] futex: Fix bug in WARN_ON for NULL q.pi_state
    Date
    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>
    CC: Thomas Gleixner <tglx@linutronix.de>
    ---
    kernel/futex.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/kernel/futex.c b/kernel/futex.c
    index 05018bf..5551ada 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);
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2012-07-20 21:41    [W:0.045 / U:29.596 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site