lkml.org 
[lkml]   [2007]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 25/32] NET: "wrong timeout value" in sk_wait_data() v2
    -stable review patch.  If anyone has any objections, please let us know.
    ---------------------

    From: Vasily Averin <vvs@sw.ru>

    sys_setsockopt() do not check properly timeout values for
    SO_RCVTIMEO/SO_SNDTIMEO, for example it's possible to set negative timeout
    values. POSIX do not defines behaviour for sys_setsockopt in case negative
    timeouts, but requires that setsockopt() shall fail with -EDOM if the send and
    receive timeout values are too big to fit into the timeout fields in the socket
    structure.
    In current implementation negative timeout can lead to error messages like
    "schedule_timeout: wrong timeout value".

    Proposed patch:
    - checks tv_usec and returns -EDOM if it is wrong
    - do not allows to set negative timeout values (sets 0 instead) and outputs
    ratelimited information message about such attempts.

    Signed-off-By: Vasily Averin <vvs@sw.ru>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>

    ---
    net/core/sock.c | 12 ++++++++++++
    1 file changed, 12 insertions(+)

    --- linux-2.6.20.13.orig/net/core/sock.c
    +++ linux-2.6.20.13/net/core/sock.c
    @@ -204,7 +204,19 @@ static int sock_set_timeout(long *timeo_
    return -EINVAL;
    if (copy_from_user(&tv, optval, sizeof(tv)))
    return -EFAULT;
    + if (tv.tv_usec < 0 || tv.tv_usec >= USEC_PER_SEC)
    + return -EDOM;

    + if (tv.tv_sec < 0) {
    + static int warned = 0;
    + *timeo_p = 0;
    + if (warned < 10 && net_ratelimit())
    + warned++;
    + printk(KERN_INFO "sock_set_timeout: `%s' (pid %d) "
    + "tries to set negative timeout\n",
    + current->comm, current->pid);
    + return 0;
    + }
    *timeo_p = MAX_SCHEDULE_TIMEOUT;
    if (tv.tv_sec == 0 && tv.tv_usec == 0)
    return 0;
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-06-08 09:35    [W:0.025 / U:31.996 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site