diff options
| author | Li Jinyue <lijinyue@huawei.com> | 2017-12-14 17:04:54 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-23 19:58:11 +0100 |
| commit | 17ae6ccfe5dd85605dc44534348b506f95d16a61 (patch) | |
| tree | a92b64f7c6e0996de6053b3db7c42a0a1a1d8752 | |
| parent | 1352130fe6aa4108fd6758687c419bb0d0c22f0d (diff) | |
| download | linux-stable-17ae6ccfe5dd85605dc44534348b506f95d16a61.tar.gz linux-stable-17ae6ccfe5dd85605dc44534348b506f95d16a61.tar.bz2 linux-stable-17ae6ccfe5dd85605dc44534348b506f95d16a61.zip | |
futex: Prevent overflow by strengthen input validation
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 29ac5b64e7c7..52b3f4703158 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -1878,6 +1878,9 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags, struct futex_q *this, *next; DEFINE_WAKE_Q(wake_q); + if (nr_wake < 0 || nr_requeue < 0) + return -EINVAL; + /* * When PI not supported: return -ENOSYS if requeue_pi is true, * consequently the compiler knows requeue_pi is always false past |