Commit 1ca7ee30 authored May 23, 2012 by Eric Dumazet Committed by David S. Miller May 24, 2012

tcp: take care of overlaps in tcp_try_coalesce()



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 b081f85c
(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>

parent e49cc0da

net/ipv4/tcp_input.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -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;

Admin message