Commit 1d57f195 authored Sep 17, 2012 by Eric Dumazet Committed by David S. Miller Sep 18, 2012

tcp: fix regression in urgent data handling



Stephan Springl found that commit 1402d366 "tcp: introduce
tcp_try_coalesce" introduced a regression for rlogin

It turns out problem comes from TCP urgent data handling and
a change in behavior in input path.

rlogin sends two one-byte packets with URG ptr set, and when next data
frame is coalesced, we lack sk_data_ready() calls to wakeup consumer.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Stephan Springl <springl-k@lar.bfw.de>
Cc: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 0e698bf6

net/ipv4/tcp_input.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -4661,7 +4661,7 @@ queue_and_out:

		if (eaten > 0)
		kfree_skb_partial(skb, fragstolen);
		else if (!sock_flag(sk, SOCK_DEAD))
		if (!sock_flag(sk, SOCK_DEAD))
		sk->sk_data_ready(sk, 0);
		return;
		}
		@@ -5556,7 +5556,6 @@ no_ack:
		#endif
		if (eaten)
		kfree_skb_partial(skb, fragstolen);
		else
		sk->sk_data_ready(sk, 0);
		return 0;
		}

Admin message