lkml.org 
[lkml]   [2012]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 104/122] tcp: Add TCP_USER_TIMEOUT negative value check
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.5-stable review patch. If anyone has any objections, please let me know.

    ------------------


    From: Hangbin Liu <liuhangbin@gmail.com>

    [ 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>
    ---
    net/ipv4/tcp.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/net/ipv4/tcp.c
    +++ b/net/ipv4/tcp.c
    @@ -2625,7 +2625,10 @@ static int do_tcp_setsockopt(struct sock
    /* 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;



    \
     
     \ /
      Last update: 2012-08-08 01:01    [W:4.576 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site