aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorBruno Martins <bgcngm@gmail.com>2018-03-28 19:55:51 +0100
committerBruno Martins <bgcngm@gmail.com>2018-03-28 19:58:22 +0100
commit03e0b4f36fc60c226adacdb48306df9ec65de33b (patch)
tree05d20001396a1c84eba56977e17800f90e0b384b /kernel
parentb74f9f2f862c0778747d70e0b2b1792fadd24e02 (diff)
parent1a83af8aa99799d4fd163a9fb6469015c89fdc99 (diff)
Merge remote-tracking branch 'common/android-3.10' into HEADHEADo8.1
Change-Id: Ice23a0b611d9bfa7a00cfa6e82a9712dcaf049e0
Diffstat (limited to 'kernel')
-rw-r--r--kernel/futex.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index fea18acbeae..929abafb30b 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