diff options
| author | Li Jinyue <lijinyue@huawei.com> | 2017-12-14 17:04:54 +0800 |
|---|---|---|
| committer | Todd Kjos <tkjos@google.com> | 2018-07-05 18:10:18 -0700 |
| commit | aa18f333a1a9dcef343807492bd461da49e2a7d7 (patch) | |
| tree | ba962dc428ffbaafccfd49aa11c54d49ffc22ee9 | |
| parent | fd7dab9d41a9255e8809bfd9238c77d029af1a5f (diff) | |
futex: Prevent overflow by strengthen input validationASB-2018-07-05_4.4-o-mr1
commit fbe0e839d1e22d88810f3ee3e2f1479be4c0aa4a upstream.
UBSAN reports signed integer overflow in kernel/futex.c:
UBSAN: Undefined behaviour in kernel/futex.c:2041:18
signed integer overflow:
0 - -2147483648 cannot be represented in type 'int'
Add a sanity check to catch negative values of nr_wake and nr_requeue.
Signed-off-by: Li Jinyue <lijinyue@huawei.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: peterz@infradead.org
Cc: dvhart@infradead.org
Link: https://lkml.kernel.org/r/1513242294-31786-1-git-send-email-lijinyue@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | kernel/futex.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index a03c7763d5f7..0d21619ac806 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -1705,6 +1705,9 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags, struct futex_q *this, *next; WAKE_Q(wake_q); + if (nr_wake < 0 || nr_requeue < 0) + return -EINVAL; + if (requeue_pi) { /* * Requeue PI only works on two distinct uaddrs. This |