diff options
| author | Li Jinyue <lijinyue@huawei.com> | 2017-12-14 17:04:54 +0800 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2018-04-13 15:00:50 +0200 |
| commit | a133a03e3d624961c20dc891f29bea904753e780 (patch) | |
| tree | 2cbe71263cbca2d94bb640e7eab2a7df3364b13a /kernel | |
| parent | ded5626f4f034352e4a452cae8ea1ae102deda9f (diff) | |
BACKPORT: futex: Prevent overflow by strengthen input validation
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>
Signed-off-by: Erick Reyes <erickreyes@google.com>
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
Cherry-picked from fbe0e839d1e22d88810f3ee3e2f1479be4c0aa4a
Change-Id: I954cc2848678318b60ec3f103d0c15f87b4605a4
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 c7787edd2..687d71e3f 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -1375,6 +1375,9 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags, struct plist_head *head1; 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 |