From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795057460; b=MQeQ0+kSgHtZtr1SNQwRvehHeaWdLwCTRZYv0p79lHr/A8H8CHCjqFqE67LalhuxxOJ4 QyLAqS8x7rQsZ+ZB9bCeHLIjWC1+T5ozLWelRfWUU52d7eC2FG3a67IkarLVyA7G2Sp6y O1Ag4K6R+ir801P/B8HNAgbyyJFOzvz1K/QzsOtbKm4xZaLBDiiW6rf5LBZAVWbc90kWN VoV79pcw8XJ9EE0kmxDGB+NxtpUVxvEsH8e9aSfGxe+/2DPqvaasprUjS0QpVKnJkxj0k XSFpsfw5AOwwDNqaNPunqpdk6hl7oAMUzKQPAwQU44/MWR+Tth0RBiVTHGp/uSoLyDA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795057460; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=ka1VOZqyVQexNxqgStwuaYcVp6KEWGtmwpAEPVdVIXA=; b=w6UWpzTW1265kv/IP8mZi9zQy+OWWuDWJFUZ+WIzHY4D/troe7cWWrpwNKFgV5SGKQG5 HUQJL2cPF2cFBxwPaAdfSMaZ4mOyoZWKk4iwta5gB1mFlv94QLxOHOHR1ZlrJMmEIMNw2 YIRm0Gl5F1bVhRZZ3VaoUA3MxD8CpONOj59SreJK3ALQUjsqQGk0z3nhVTmWJGF3gTCij eAro5I6z+vJvUQU0rmG88KrhqXmYKKweVcdIF8uw9i8FRkxzhrQ6veT7nR+/MWVzlkhMc Rw92GPy+aU+I2lv2qKbaRIV8hiZOz+mRawNqycUW3PakxZDXPKPZl6I+kSyMPedlB3A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=LXUaqZQp; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DBF23606A335; Thu, 19 Nov 2026 03:04:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=LXUaqZQp Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3B571F000C7; Thu, 19 Nov 2026 03:04:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795057460; bh=ka1VOZqyVQexNxqgStwuaYcVp6KEWGtmwpAEPVdVIXA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LXUaqZQpmJGnkHC1wWEQT5+CBP+QQuequnV0N6P3JuR9xndP3bNG7VFHRe7DEWWzM d3k0QTXKdktN51Qqmiz6GFNOCPGZFzXUB3D9xLvT6ICaJMY2Jm95NGk4LhO6T51S0E x721UG7vbLXkM6GAb6laeJX24FOsRsV3CvjFdeaA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Florian Westphal , Minghao Zhang , Jianjun Chen , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 5.10 0136/1848] netfilter: conntrack: tcp: use UNACK timeout for non-closing RST packets Date: Wed, 18 Nov 2026 15:36:14 +0100 Message-ID: <20261118145916.948630171@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Minghao Zhang [ Upstream commit bf80e6802273a900311b44e47c9b1a59c6d2473c ] Commit be0502a3f2e9 ("netfilter: conntrack: tcp: only close if RST matches exact sequence") keeps an established conntrack entry in ESTABLISHED when an in-window RST does not match the expected sequence number exactly, so the endpoint can validate the RST with a challenge ACK. The timeout selection nevertheless uses the CLOSE timeout for every RST packet. The bug is that timeout selection is based on the packet type, not on the state transition result: even when RST validation keeps new_state in ESTABLISHED, the timeout is still forced to TCP_CONNTRACK_CLOSE. Linux TCP independently rate limits challenge ACKs per socket. A second non-exact RST can therefore arrive after the first challenge ACK has restored the timeout but before the rate limit expires. The second RST lowers the timeout to 10 seconds again while the endpoint suppresses the second challenge ACK, allowing the conntrack entry to expire while both TCP endpoints remain established. Using the ESTABLISHED timeout for such RSTs would avoid this short expiration window, but it could also retain stale entries for the five-day default because conntrack cannot reliably match the endpoint's exact TCP state. Use the UNACK timeout for RST packets that leave the conntrack entry in TCP_CONNTRACK_ESTABLISHED. Exact-match RSTs and accepted RST packet trains still fall through to timeouts[new_state], which preserves the CLOSE timeout when conntrack accepts the RST as closing the flow. This avoids the aggressive 10-second expiration window for non-exact RSTs while preserving the short timeout for RSTs that conntrack accepts as closing the flow. Suggested-by: Florian Westphal Reported-by: Minghao Zhang Reported-by: Jianjun Chen Signed-off-by: Minghao Zhang Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_conntrack_proto_tcp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index 7ddc751f979eb..fc6cf4b12154d 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c @@ -1134,8 +1134,9 @@ int nf_conntrack_tcp_packet(struct nf_conn *ct, if (ct->proto.tcp.retrans >= tn->tcp_max_retrans && timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS]) timeout = timeouts[TCP_CONNTRACK_RETRANS]; - else if (unlikely(index == TCP_RST_SET)) - timeout = timeouts[TCP_CONNTRACK_CLOSE]; + else if (unlikely(index == TCP_RST_SET && + new_state == TCP_CONNTRACK_ESTABLISHED)) + timeout = timeouts[TCP_CONNTRACK_UNACK]; else if ((ct->proto.tcp.seen[0].flags | ct->proto.tcp.seen[1].flags) & IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED && timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK]) -- 2.53.0