Commit 9f9a14a8 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'tcp-a-couple-of-fixes' 

Paolo Abeni says:

====================
tcp: a couple of fixes

This series includes a couple of follow-up for the recent tcp receiver
changes, addressing issues outlined by the nipa CI and the mptcp
self-tests.

Note that despite the affected self-tests where MPTCP ones, the issues
are really in the TCP code, see patch 1 for the details.

v1: https://lore.kernel.org/cover.1752859383.git.pabeni@redhat.com
====================

Link: https://patch.msgid.link/cover.1753118029.git.pabeni@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 8839d1cc b115c775

net/ipv4/tcp_input.c

+9 −1
Original line number Diff line number Diff line
@@ -5549,6 +5549,10 @@ static int tcp_prune_queue(struct sock *sk, const struct sk_buff *in_skb) 
{

	struct tcp_sock *tp = tcp_sk(sk);



	/* Do nothing if our queues are empty. */

	if (!atomic_read(&sk->sk_rmem_alloc))

		return -1;



	NET_INC_STATS(sock_net(sk), LINUX_MIB_PRUNECALLED);



	if (!tcp_can_ingest(sk, in_skb))
@@ -5911,7 +5915,11 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb, 
		if (!th->rst) {

			if (th->syn)

				goto syn_challenge;

			NET_INC_STATS(sock_net(sk), LINUX_MIB_BEYOND_WINDOW);



			if (reason == SKB_DROP_REASON_TCP_INVALID_SEQUENCE ||

			    reason == SKB_DROP_REASON_TCP_INVALID_END_SEQUENCE)

				NET_INC_STATS(sock_net(sk),

					      LINUX_MIB_BEYOND_WINDOW);

			if (!tcp_oow_rate_limited(sock_net(sk), skb,

						  LINUX_MIB_TCPACKSKIPPEDSEQ,

						  &tp->last_oow_ack_time))