lkml.org 
[lkml]   [2010]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[091/117] net: Fix oops from tcp_collapse() when using splice()
    2.6.33-stable review patch.  If anyone has any objections, please let us know.

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


    From: Steven J. Magnani <steve@digidescorp.com>

    [ Upstream commit baff42ab1494528907bf4d5870359e31711746ae ]

    tcp_read_sock() can have a eat skbs without immediately advancing copied_seq.
    This can cause a panic in tcp_collapse() if it is called as a result
    of the recv_actor dropping the socket lock.

    A userspace program that splices data from a socket to either another
    socket or to a file can trigger this bug.

    Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    net/ipv4/tcp.c | 1 +
    1 file changed, 1 insertion(+)

    --- a/net/ipv4/tcp.c
    +++ b/net/ipv4/tcp.c
    @@ -1368,6 +1368,7 @@ int tcp_read_sock(struct sock *sk, read_
    sk_eat_skb(sk, skb, 0);
    if (!desc->count)
    break;
    + tp->copied_seq = seq;
    }
    tp->copied_seq = seq;




    \
     
     \ /
      Last update: 2010-05-12 10:17    [W:0.043 / U:59.272 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site