Commit:     23aeeec365dcf8bc87fae44c533e50d0bb4f23cc
Parent:     746aa32d280084dbd520249170852e4616799928
Author:     Ilpo J�rvinen <[EMAIL PROTECTED]>
AuthorDate: Tue Nov 13 21:03:13 2007 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Tue Nov 13 21:03:13 2007 -0800

    [TCP] FRTO: Plug potential LOST-bit leak
    It might be possible that, in some extreme scenario that
    I just cannot now construct in my mind, end_seq <=
    frto_highmark check does not match causing the lost_out
    and LOST bits become out-of-sync due to clearing and
    recounting in the loop.
    This may fix LOST-bit leak reported by Chazarain Guillaume
    Signed-off-by: Ilpo J�rvinen <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 net/ipv4/tcp_input.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index b59da53..12ae9a6 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1704,6 +1704,8 @@ static void tcp_enter_frto_loss(struct sock *sk, int 
allowed_segments, int flag)
        tcp_for_write_queue(skb, sk) {
                if (skb == tcp_send_head(sk))
+               TCP_SKB_CB(skb)->sacked &= ~TCPCB_LOST;
                 * Count the retransmission made on RTO correctly (only when
                 * waiting for the first ACK and did not get it)...
@@ -1717,7 +1719,7 @@ static void tcp_enter_frto_loss(struct sock *sk, int 
allowed_segments, int flag)
                } else {
                        if (TCP_SKB_CB(skb)->sacked & TCPCB_RETRANS)
                                tp->undo_marker = 0;
-                       TCP_SKB_CB(skb)->sacked &= 
+                       TCP_SKB_CB(skb)->sacked &= ~TCPCB_SACKED_RETRANS;
                /* Don't lost mark skbs that were fwd transmitted after RTO */
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to