diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-08-01 15:33:26 +0300 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2015-12-06 00:49:05 +0100 |
| commit | 4ad8ce65628e282aece91d6139fd556f7864f950 (patch) | |
| tree | 4ea5bb35a5dced051568d1c5419398d3259ce4b1 | |
| parent | 70397cf66e8d1ac9b06726f5825d03342996763d (diff) | |
rds: fix an integer overflow test in rds_info_getsockopt()
commit 468b732b6f76b138c0926eadf38ac88467dcd271 upstream.
"len" is a signed integer. We check that len is not negative, so it
goes from zero to INT_MAX. PAGE_SIZE is unsigned long so the comparison
is type promoted to unsigned long. ULONG_MAX - 4095 is a higher than
INT_MAX so the condition can never be true.
I don't know if this is harmful but it seems safe to limit "len" to
INT_MAX - 4095.
Fixes: a8c879a7ee98 ('RDS: Info and stats')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
(cherry picked from commit f3a66bdc88c3261f55b942453476e623056b92d9)
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -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 814a91a6f4a7..0a857a000748 100644 --- a/net/rds/info.c +++ b/net/rds/info.c @@ -174,7 +174,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; } |