lkml.org 
[lkml]   [2016]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.8 08/49] tcp: fix return value for partial writes
    Date
    4.8-stable review patch.  If anyone has any objections, please let me know.

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

    From: Eric Dumazet <edumazet@google.com>


    [ Upstream commit 79d8665b9545e128637c51cf7febde9c493b6481 ]

    After my commit, tcp_sendmsg() might restart its loop after
    processing socket backlog.

    If sk_err is set, we blindly return an error, even though we
    copied data to user space before.

    We should instead return number of bytes that could be copied,
    otherwise user space might resend data and corrupt the stream.

    This might happen if another thread is using recvmsg(MSG_ERRQUEUE)
    to process timestamps.

    Issue was diagnosed by Soheil and Willem, big kudos to them !

    Fixes: d41a69f1d390f ("tcp: make tcp_sendmsg() aware of socket backlog")
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Cc: Willem de Bruijn <willemb@google.com>
    Cc: Soheil Hassas Yeganeh <soheil@google.com>
    Cc: Yuchung Cheng <ycheng@google.com>
    Cc: Neal Cardwell <ncardwell@google.com>
    Tested-by: Soheil Hassas Yeganeh <soheil@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv4/tcp.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/net/ipv4/tcp.c
    +++ b/net/ipv4/tcp.c
    @@ -1145,7 +1145,7 @@ restart:

    err = -EPIPE;
    if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))
    - goto out_err;
    + goto do_error;

    sg = !!(sk->sk_route_caps & NETIF_F_SG);


    \
     
     \ /
      Last update: 2016-11-19 10:33    [W:2.142 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site