tcp: take care of overlaps in tcp_try_coalesce()
authorEric Dumazet <edumazet@google.com>
Wed, 23 May 2012 17:51:37 +0000 (17:51 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 24 May 2012 04:28:21 +0000 (00:28 -0400)
Sergio Correia reported following warning :

WARNING: at net/ipv4/tcp.c:1301 tcp_cleanup_rbuf+0x4f/0x110()

WARN(skb && !before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq),
     "cleanup rbuf bug: copied %X seq %X rcvnxt %X\n",
     tp->copied_seq, TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt);

It appears TCP coalescing, and more specifically commit b081f85c297
(net: implement tcp coalescing in tcp_queue_rcv()) should take care of
possible segment overlaps in receive queue. This was properly done in
the case of out_or_order_queue by the caller.

For example, segment at tail of queue have sequence 1000-2000, and we
add a segment with sequence 1500-2500.
This can happen in case of retransmits.

In this case, just don't do the coalescing.

Reported-by: Sergio Correia <lists@uece.net>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Tested-by: Sergio Correia <lists@uece.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_input.c

index cfa2aa1283426033137242183427c9f53a47a9cc..b224eb8bce8b3c6644eb003fd1346dde30e77c83 100644 (file)
@@ -4555,6 +4555,11 @@ static bool tcp_try_coalesce(struct sock *sk,
 
        if (tcp_hdr(from)->fin)
                return false;
+
+       /* Its possible this segment overlaps with prior segment in queue */
+       if (TCP_SKB_CB(from)->seq != TCP_SKB_CB(to)->end_seq)
+               return false;
+
        if (!skb_try_coalesce(to, from, fragstolen, &delta))
                return false;