Netfilter fixes for net
Subsystems (3)
Pablo Neira Ayuso
maintainercover Netfilter fixes for net
Hi,
The following patchset contains Netfilter fixes for net:
1) Fix syn-retransmits until initiator gives up when connection is re-used due to rst marked as invalid, from Florian Westphal.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git
Thanks.
----------------------------------------------------------------
The following changes since commit 1f3bd64ad921f051254591fbed04fd30b306cde6:
net: stmmac: fix invalid call to mdiobus_get_phy() (2023-01-17 13:33:19 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git HEAD
for you to fetch changes up to c410cb974f2ba562920ecb8492ee66945dcf88af:
netfilter: conntrack: handle tcp challenge acks during connection reuse (2023-01-17 23:00:06 +0100)
----------------------------------------------------------------
Florian Westphal (1):
netfilter: conntrack: handle tcp challenge acks during connection reuse
net/netfilter/nf_conntrack_proto_tcp.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: conntrack: handle tcp challenge acks during connection reuse
From: Florian Westphal <[email protected]>
When a connection is re-used, following can happen:
[ connection starts to close, fin sent in either direction ]
Quoted 1 line
syn # initator quickly reuses connection
< ack # peer sends a challenge ack > rst # rst, sequence number == ack_seq of previous challenge ack > syn # this syn is expected to pass
Problem is that the rst will fail window validation, so it gets tagged as invalid.
If ruleset drops such packets, we get repeated syn-retransmits until initator gives up or peer starts responding with syn/ack.
Before the commit indicated in the "Fixes" tag below this used to work:
The challenge-ack made conntrack re-init state based on the challenge ack itself, so the following rst would pass window validation.
Add challenge-ack support: If we get ack for syn, record the ack_seq, and then check if the rst sequence number matches the last ack number seen in reverse direction.
--- net/netfilter/nf_conntrack_proto_tcp.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
net/netfilter/nf_conntrack_proto_tcp.c +15 -0
@@ -1068,6 +1068,13 @@ int nf_conntrack_tcp_packet(struct nf_conn *ct, ct->proto.tcp.last_flags |=IP_CT_EXP_CHALLENGE_ACK ; } + +/* possible challenge ack reply to syn */ +if (old_state ==TCP_CONNTRACK_SYN_SENT && + index ==TCP_ACK_SET && + dir ==IP_CT_DIR_REPLY ) + ct->proto.tcp.last_ack =ntohl (th->ack_seq); +spin_unlock_bh (&ct->lock); nf_ct_l4proto_log_invalid(skb, ct, state, "packet (index %d) in dir %d ignored, state %s",
@@ -1193,6 +1200,14 @@ int nf_conntrack_tcp_packet(struct nf_conn *ct,* segments we ignored. */ goto in_window; } + +/* Reset in response to a challenge-ack we let through earlier */ +if (old_state ==TCP_CONNTRACK_SYN_SENT && + ct->proto.tcp.last_index ==TCP_ACK_SET && + ct->proto.tcp.last_dir ==IP_CT_DIR_REPLY && +ntohl (th->seq) == ct->proto.tcp.last_ack) + goto in_window; +break ;default :/* Keep compilers happy. */
Signature · 1 line
2.30.2
Re: [PATCH net 1/1] netfilter: conntrack: handle tcp challenge acks during connection reuse
This patch was applied to netdev/net.git (master) by Pablo Neira Ayuso <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Pablo Neira Ayuso <[email protected]>:
Quoted 10 lines · On Wed, 18 Jan 2023 10:54:24 +0100 you wrote:
From: Florian Westphal <[email protected]>
When a connection is re-used, following can happen:
[ connection starts to close, fin sent in either direction ]Quoted 1 line
syn # initator quickly reuses connection
< ack # peer sends a challenge ack > rst # rst, sequence number == ack_seq of previous challenge ack > syn # this syn is expected to pass[...]
Here is the summary with links:
- [net,1/1] netfilter: conntrack: handle tcp challenge acks during connection reuse
https://git.kernel.org/netdev/net/c/c410cb974f2b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html