From: Hangbin Liu Date: Thu, 26 Jul 2012 22:52:21 +0000 (+0000) Subject: tcp: Add TCP_USER_TIMEOUT negative value check X-Git-Tag: v3.6-rc1~68^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=42493570100b91ef663c4c6f0c0fdab238f9d3c2;p=platform%2Fkernel%2Flinux-3.10.git tcp: Add TCP_USER_TIMEOUT negative value check 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 Signed-off-by: David S. Miller --- diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 581ecf0..e7e6eea 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2681,7 +2681,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;