mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 03:36:19 +00:00
futex: pass nr_wake2 to futex_wake_op
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> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
c0f3358621
commit
f54f098612
1 changed files with 3 additions and 1 deletions
|
@ -2060,8 +2060,10 @@ asmlinkage long sys_futex(u32 __user *uaddr, int op, u32 val,
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
* requeue parameter in 'utime' if cmd == FUTEX_REQUEUE.
|
* 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;
|
val2 = (u32) (unsigned long) utime;
|
||||||
|
|
||||||
return do_futex(uaddr, op, val, tp, uaddr2, val2, val3);
|
return do_futex(uaddr, op, val, tp, uaddr2, val2, val3);
|
||||||
|
|
Loading…
Reference in a new issue