mirror of
https://github.com/torvalds/linux.git
synced 2026-09-22 12:44:03 +02:00
netfilter: conntrack: always lower timeout for non-closing RST packets
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: bf80e68022 ("netfilter: conntrack: tcp: use UNACK timeout for non-closing RST packets")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
parent
3679da4ad8
commit
73df81b38c
|
|
@ -1282,7 +1282,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 &&
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user