diff options
author | Li Jinyue <lijinyue@huawei.com> | 2017-12-14 17:04:54 +0800 |
---|---|---|
committer | Sasha Levin <alexander.levin@microsoft.com> | 2018-02-28 22:09:38 -0500 |
commit | c3e715e4a45301380a1ae1f677de2f1a428b6349 (patch) | |
tree | 81f3b7382789c6eeb35f1045edd9d3a9fe9a6c45 /kernel | |
parent | 3170e194abb27e295da07d215bfbc8ceca21f1df (diff) |
futex: Prevent overflow by strengthen input validation
[ Upstream commit fbe0e839d1e22d88810f3ee3e2f1479be4c0aa4a ]
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
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/1513242294-31786-1-git-send-email-lijinyue@huawei.com
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Diffstat (limited to 'kernel')
-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 959cc4fc6de5..4195616b27d9 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -1514,6 +1514,9 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags, struct futex_hash_bucket *hb1, *hb2; struct futex_q *this, *next; + if (nr_wake < 0 || nr_requeue < 0) + return -EINVAL; + if (requeue_pi) { /* * Requeue PI only works on two distinct uaddrs. This |