diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:01:59 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:01:59 +0800 |
| commit | 4e5a5112cc603d1dcfe7247723e1c08b8ffbc7ff (patch) | |
| tree | 0eafc6ed77e008065ece3acd9ea83cc1a19a4122 /kernel/futex.c | |
| parent | 05eda3c7aedbe06e9692a4a1ca511c6ab3d72de5 (diff) | |
| parent | 90aaf2f25609f99b63fcbed280716f80b4bc5f56 (diff) | |
Merge tag 'v3.18.93' into linux-linaro-lsk-v3.18lsk-v3.18-18.02
This is the 3.18.93 stable release
Diffstat (limited to 'kernel/futex.c')
| -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 54ebb63711f4..168f369c5eea 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 |