diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-10-14 13:41:57 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-10-14 13:41:57 -0700 |
| commit | c6df33694dbe813e34da1f893cbc08a5822a26d7 (patch) | |
| tree | c73e8332df16575a2a6dedbc0fc8a34b5ddc6587 /net/rds/info.c | |
| parent | f0b7ed42af0d718fc11d45f6c05948e9a11e08be (diff) | |
| parent | 974070b95b0c8ff6ef0d62109c16aea160cf3c7c (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-15.11-androidlsk-v3.10-15.10-android
Diffstat (limited to 'net/rds/info.c')
| -rw-r--r-- | net/rds/info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rds/info.c b/net/rds/info.c index 9a6b4f66187c..140a44a5f7b7 100644 --- a/net/rds/info.c +++ b/net/rds/info.c @@ -176,7 +176,7 @@ int rds_info_getsockopt(struct socket *sock, int optname, char __user *optval, /* check for all kinds of wrapping and the like */ start = (unsigned long)optval; - if (len < 0 || len + PAGE_SIZE - 1 < len || start + len < start) { + if (len < 0 || len > INT_MAX - PAGE_SIZE + 1 || start + len < start) { ret = -EINVAL; goto out; } |