Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Jakub Kicinski <kuba@kernel.org>
+9
-1
+9
-1
net/ipv4/tcp_input.c
+9
-1
net/ipv4/tcp_input.c
···
5549
5549
{
5550
5550
struct tcp_sock *tp = tcp_sk(sk);
5551
5551
5552
+
/* Do nothing if our queues are empty. */
5553
+
if (!atomic_read(&sk->sk_rmem_alloc))
5554
+
return -1;
5555
+
5552
5556
NET_INC_STATS(sock_net(sk), LINUX_MIB_PRUNECALLED);
5553
5557
5554
5558
if (!tcp_can_ingest(sk, in_skb))
···
5915
5911
if (!th->rst) {
5916
5912
if (th->syn)
5917
5913
goto syn_challenge;
5918
-
NET_INC_STATS(sock_net(sk), LINUX_MIB_BEYOND_WINDOW);
5914
+
5915
+
if (reason == SKB_DROP_REASON_TCP_INVALID_SEQUENCE ||
5916
+
reason == SKB_DROP_REASON_TCP_INVALID_END_SEQUENCE)
5917
+
NET_INC_STATS(sock_net(sk),
5918
+
LINUX_MIB_BEYOND_WINDOW);
5919
5919
if (!tcp_oow_rate_limited(sock_net(sk), skb,
5920
5920
LINUX_MIB_TCPACKSKIPPEDSEQ,
5921
5921
&tp->last_oow_ack_time))