lkml.org 
[lkml]   [2007]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 54/59] TCP: Fix sorting of SACK blocks.
    -stable review patch.  If anyone has any objections, please let us know.
    ------------------

    From: Baruch Even <baruch@ev-en.org>

    The sorting of SACK blocks actually munges them rather than sort,
    causing the TCP stack to ignore some SACK information and breaking the
    assumption of ordered SACK blocks after sorting.

    The sort takes the data from a second buffer which isn't moved causing
    subsequent data moves to occur from the wrong location. The fix is to
    use a temporary buffer as a normal sort does.

    Signed-off-By: Baruch Even <baruch@ev-en.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    ---
    net/ipv4/tcp_input.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    --- linux-2.6.19.2.orig/net/ipv4/tcp_input.c
    +++ linux-2.6.19.2/net/ipv4/tcp_input.c
    @@ -1011,10 +1011,11 @@ tcp_sacktag_write_queue(struct sock *sk,
    for (j = 0; j < i; j++){
    if (after(ntohl(sp[j].start_seq),
    ntohl(sp[j+1].start_seq))){
    - sp[j].start_seq = htonl(tp->recv_sack_cache[j+1].start_seq);
    - sp[j].end_seq = htonl(tp->recv_sack_cache[j+1].end_seq);
    - sp[j+1].start_seq = htonl(tp->recv_sack_cache[j].start_seq);
    - sp[j+1].end_seq = htonl(tp->recv_sack_cache[j].end_seq);
    + struct tcp_sack_block_wire tmp;
    +
    + tmp = sp[j];
    + sp[j] = sp[j+1];
    + sp[j+1] = tmp;
    }

    }
    --
    -
    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-02-03 03:49    [W:0.036 / U:1.800 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site