lkml.org 
[lkml]   [2007]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[2.6.22.2 review 42/84] futex: pass nr_wake2 to futex_wake_op

    From: Andreas Schwab <schwab@suse.de>

    The fourth argument of sys_futex is ignored when op == FUTEX_WAKE_OP,
    but futex_wake_op expects it as its nr_wake2 parameter.

    The only user of this operation in glibc is always passing 1, so this
    bug had no consequences so far.

    Signed-off-by: Andreas Schwab <schwab@suse.de>
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Ulrich Drepper <drepper@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    kernel/futex.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/kernel/futex.c
    +++ b/kernel/futex.c
    @@ -2061,8 +2061,10 @@ asmlinkage long sys_futex(u32 __user *ua
    }
    /*
    * requeue parameter in 'utime' if cmd == FUTEX_REQUEUE.
    + * number of waiters to wake in 'utime' if cmd == FUTEX_WAKE_OP.
    */
    - if (cmd == FUTEX_REQUEUE || cmd == FUTEX_CMP_REQUEUE)
    + if (cmd == FUTEX_REQUEUE || cmd == FUTEX_CMP_REQUEUE ||
    + cmd == FUTEX_WAKE_OP)
    val2 = (u32) (unsigned long) utime;

    return do_futex(uaddr, op, val, tp, uaddr2, val2, val3);
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-08-07 23:25    [W:0.020 / U:61.280 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site