diff options
author | Hangbin Liu <liuhangbin@gmail.com> | 2012-07-26 22:52:21 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-09 08:27:52 -0700 |
commit | 8d7c99de6821880884e6f9ade1c6f269d40ebbae (patch) | |
tree | 55cb6400a9bd0a5b6c7df43e71c9d21f4600afff /net/ipv4/tcp.c | |
parent | 8a22bda491f4fb197c31c2d50c18a816be494a75 (diff) | |
download | kernel_samsung_tuna-8d7c99de6821880884e6f9ade1c6f269d40ebbae.zip kernel_samsung_tuna-8d7c99de6821880884e6f9ade1c6f269d40ebbae.tar.gz kernel_samsung_tuna-8d7c99de6821880884e6f9ade1c6f269d40ebbae.tar.bz2 |
tcp: Add TCP_USER_TIMEOUT negative value check
[ Upstream commit 42493570100b91ef663c4c6f0c0fdab238f9d3c2 ]
TCP_USER_TIMEOUT is a TCP level socket option that takes an unsigned int. But
patch "tcp: Add TCP_USER_TIMEOUT socket option"(dca43c75) didn't check the negative
values. If a user assign -1 to it, the socket will set successfully and wait
for 4294967295 miliseconds. This patch add a negative value check to avoid
this issue.
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r-- | net/ipv4/tcp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 6db041d..b6ec23c 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2394,7 +2394,10 @@ static int do_tcp_setsockopt(struct sock *sk, int level, /* Cap the max timeout in ms TCP will retry/retrans * before giving up and aborting (ETIMEDOUT) a connection. */ - icsk->icsk_user_timeout = msecs_to_jiffies(val); + if (val < 0) + err = -EINVAL; + else + icsk->icsk_user_timeout = msecs_to_jiffies(val); break; default: err = -ENOPROTOOPT; |