Commit:     29d0a309d11bac9e57af914d0d6a35cde0080861
Parent:     182f6ed5188ccb46d1c54c3334943a54110d0118
Author:     Ilpo Järvinen <[EMAIL PROTECTED]>
AuthorDate: Sun Oct 7 23:36:41 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:54:47 2007 -0700

    [TCP]: Fix two off-by-one errors in fackets_out adjusting logic
    1) Passing wrong skb to tcp_adjust_fackets_out could corrupt
    fastpath_cnt_hint as tcp_skb_pcount(next_skb) is not included
    to it if hint points exactly to the next_skb (it's lagging
    behind, see sacktag).
    2) When fastpath_skb_hint is put backwards to avoid dangling
    skb reference, the skb's pcount must also be removed from count
    (not included like above).
    Reported by Cedric Le Goater <[EMAIL PROTECTED]>
    Signed-off-by: Ilpo Järvinen <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 net/ipv4/tcp_output.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 6199abe..5329675 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1755,14 +1755,16 @@ static void tcp_retrans_try_collapse(struct sock *sk, 
struct sk_buff *skb, int m
                if (tcp_is_reno(tp) && tp->sacked_out)
                        tcp_dec_pcount_approx(&tp->sacked_out, next_skb);
-               tcp_adjust_fackets_out(tp, skb, tcp_skb_pcount(next_skb));
+               tcp_adjust_fackets_out(tp, next_skb, tcp_skb_pcount(next_skb));
                tp->packets_out -= tcp_skb_pcount(next_skb);
                /* changed transmit queue under us so clear hints */
                /* manually tune sacktag skb hint */
-               if (tp->fastpath_skb_hint == next_skb)
+               if (tp->fastpath_skb_hint == next_skb) {
                        tp->fastpath_skb_hint = skb;
+                       tp->fastpath_cnt_hint -= tcp_skb_pcount(skb);
+               }
                sk_stream_free_skb(sk, next_skb);
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