]> git.hungrycats.org Git - linux/commitdiff
netfilter: conntrack: always lower timeout for non-closing RST packets
authorPablo Neira Ayuso <pablo@netfilter.org>
Mon, 10 Aug 2026 08:18:22 +0000 (10:18 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Nov 2026 17:06:14 +0000 (12:06 -0500)
commit 73df81b38cb7f70a347a97370386378a86e53019 upstream.

The existing check might extend the timeout if the ESTABLISHED timeout
has been tuned to be lower than UNACK via sysctl. Reported by sashiko.

Fixes: bf80e6802273 ("netfilter: conntrack: tcp: use UNACK timeout for non-closing RST packets")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/netfilter/nf_conntrack_proto_tcp.c

index 456721e40ed0c0e66ec2ec5b9ebbdd25b7ec075c..03b32bd397d322e33d25eb716f0812084c998b94 100644 (file)
@@ -1326,7 +1326,8 @@ int nf_conntrack_tcp_packet(struct nf_conn *ct,
            timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS])
                timeout = timeouts[TCP_CONNTRACK_RETRANS];
        else if (unlikely(index == TCP_RST_SET &&
-                         new_state == TCP_CONNTRACK_ESTABLISHED))
+                         new_state == TCP_CONNTRACK_ESTABLISHED) &&
+                timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK])
                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 &&