lkml.org 
[lkml]   [2012]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 53/66] tcp-repair: Handle zero-length data put in rcv queue
    Date
    3.6-stable review patch.  If anyone has any objections, please let me know.

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


    From: Pavel Emelyanov <xemul@parallels.com>

    [ Upstream commit c454e6111d1ef4268fe98e87087216e51c2718c3 ]

    When sending data into a tcp socket in repair state we should check
    for the amount of data being 0 explicitly. Otherwise we'll have an skb
    with seq == end_seq in rcv queue, but tcp doesn't expect this to happen
    (in particular a warn_on in tcp_recvmsg shoots).

    Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
    Reported-by: Giorgos Mavrikas <gmavrikas@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv4/tcp_input.c | 3 +++
    1 file changed, 3 insertions(+)

    --- a/net/ipv4/tcp_input.c
    +++ b/net/ipv4/tcp_input.c
    @@ -4556,6 +4556,9 @@ int tcp_send_rcvq(struct sock *sk, struc
    struct tcphdr *th;
    bool fragstolen;

    + if (size == 0)
    + return 0;
    +
    skb = alloc_skb(size + sizeof(*th), sk->sk_allocation);
    if (!skb)
    goto err;



    \
     
     \ /
      Last update: 2012-11-15 06:22    [W:2.706 / U:0.820 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site