From nobody Tue Nov 25 15:04:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dG5Zh0dZyz6JH2T for ; Tue, 25 Nov 2025 15:04:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dG5Zg6vfnz3YV8 for ; Tue, 25 Nov 2025 15:04:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764083084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1gB1OC14ObAtgs1Emd0H2h4zuVeWhQ90Cl5yKzr3Lss=; b=yxhBaywDUeznd78MIlv/EMWZfwiDZxnGLMdkK+9VXUrwPANMe1V7eVkNo7KdN2zlINCPgl zobufEfxXCIm8zB5tnXh05soD3wNJO0vA1a2mniCvyj/CNc5MmPIzG9HM+ytptGwkLqUqy xFsdbN2HB0JxQOKgxg0Yh5Ic7ViwnD2U9ALmObZnJpV92BzXxh3npG8QE95fFTPls7PvWn wN68vuv7Ak5thQ6DaP5AoqcpLUfHyeKfr2zFXZB4KSygp+sy69aTI850IVS+wRPA+Av2D5 Y7OjB6AE4upwi8gB6h2zRKr963GVof6YjjJaWplLxNYf1furejIQnv1f2YbrVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764083084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1gB1OC14ObAtgs1Emd0H2h4zuVeWhQ90Cl5yKzr3Lss=; b=Sy3la0G+NW3H392YFqMyTWXNw5/fuqEjC8g6DkmEP1N9VmHxKRNdk+Q+9tjX8H3UzkRtw5 0F5sB7maB6EXzfUQYeB1DYGSurZqidPDCtTMD+ekIcjqbUXPb5kt8dIZO/G4JxQ/iLrEI4 JSrgh31klKrBxrnkhGyIQcM8AAYQaTS0FNj73uZmG4qDzOfkwc+mWhMpnbl5Ww7JBUmq7g qTBQi+x0xe8owEHJ6O5k2MvuEmgLYnT8SLg70x//iH3giOBV5q3d1QSn7MgVU5qtTVVF1o gnyWcq7hT7xJuWhgMMhYSNwfy8+BE5/dxQaOpwjYdicNLYCLfVf4rpvgq2FylQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764083084; a=rsa-sha256; cv=none; b=ekyQeLwJ7fHxmskC/Y2DKzuBUC3qggZAJ9ZqtA8tg1twjsXITf8Vp7BlpZZpnHw2ErGiHL cPdlSJ/1w50HndH+yFuWlH2yK2/tiandGozQekJXjvhde2DYKqcc7eIc9GjGdssZsvMygm jOMpBx2r9W362xORm3R/JE1Tx3/eBHm8T/MY64ZFXIOn1B9CSeCK2EbPvSl790g8ioPVNV YZYO9A3b+3NuuwGuNCYjl2dpzKrJvFTG/cypF2f7YE92gKTbWeHObq8SsoxFdPeEjvE9UD iwbOXGpo9NfuLnIHzySkNdRLZ67GsxIl0Hfgbsg+agKxAUGsGDeI54WfaUA4+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dG5Zg6G0Tz15ZL for ; Tue, 25 Nov 2025 15:04:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 348ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Nov 2025 15:04:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: bc3b72ff4895 - main - pf: relax sctp v_tag verification List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc3b72ff48953551e0e8bd6e5a2c718ecd973285 Auto-Submitted: auto-generated Date: Tue, 25 Nov 2025 15:04:43 +0000 Message-Id: <6925c58b.348ed.7b222851@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=bc3b72ff48953551e0e8bd6e5a2c718ecd973285 commit bc3b72ff48953551e0e8bd6e5a2c718ecd973285 Author: Kristof Provost AuthorDate: 2025-11-25 09:59:02 +0000 Commit: Kristof Provost CommitDate: 2025-11-25 14:59:55 +0000 pf: relax sctp v_tag verification pf was too strict when validating SCTP tags. When a server receives a retransmitted INIT it will reply with a random initiate tag every time. However, pf saves the first initiate tag and expects every subsequent INIT_ACK retransmission to have the same tag. This is not the case, leading to endless INIT/INIT_ACK cycles. Allow the tag to be updated as long as we've not gone past COOKIE_WAIT. Add a test case to verify this. MFC after: 2 weeks See also: https://redmine.pfsense.org/issues/16516 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 6 +++- tests/sys/netpfil/pf/sctp.py | 67 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 5e919e35b07b..74d2182fe77b 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7396,7 +7396,11 @@ pf_sctp_track(struct pf_kstate *state, struct pf_pdesc *pd, } if (src->scrub != NULL) { - if (src->scrub->pfss_v_tag == 0) + /* + * Allow tags to be updated, in case of retransmission of + * INIT/INIT_ACK chunks. + **/ + if (src->state <= SCTP_COOKIE_WAIT) src->scrub->pfss_v_tag = pd->hdr.sctp.v_tag; else if (src->scrub->pfss_v_tag != pd->hdr.sctp.v_tag) return (PF_DROP); diff --git a/tests/sys/netpfil/pf/sctp.py b/tests/sys/netpfil/pf/sctp.py index f492f26b63a1..9f1d7dea4ef6 100644 --- a/tests/sys/netpfil/pf/sctp.py +++ b/tests/sys/netpfil/pf/sctp.py @@ -551,6 +551,73 @@ class TestSCTP(VnetTestTemplate): assert re.search(r"epair.*sctp 192.0.2.1:.*192.0.2.3:1234", states) assert re.search(r"epair.*sctp 192.0.2.1:.*192.0.2.2:1234", states) +class TestSCTP_SRV(VnetTestTemplate): + REQUIRED_MODULES = ["sctp", "pf"] + TOPOLOGY = { + "vnet1": {"ifaces": ["if1"]}, + "vnet2": {"ifaces": ["if1"]}, + "if1": {"prefixes4": [("192.0.2.1/24", "192.0.2.2/24")]}, + } + + def vnet2_handler(self, vnet): + ToolsHelper.print_output("/sbin/pfctl -e") + ToolsHelper.pf_rules([ + "set state-policy if-bound", + "pass inet proto sctp", + "pass on lo"]) + + # Start an SCTP server process, pipe the ppid + data back to the other vnet? + srv = SCTPServer(socket.AF_INET, port=1234) + while True: + srv.accept(vnet) + + @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) + def test_initiate_tag_check(self): + # Ensure we don't send ABORTs in response to the other end's INIT_ACK + # That'd interfere with our test. + ToolsHelper.print_output("/sbin/sysctl net.inet.sctp.blackhole=2") + + import scapy.all as sp + + packet = sp.IP(src="192.0.2.1", dst="192.0.2.2") \ + / sp.SCTP(sport=1234, dport=1234) \ + / sp.SCTPChunkInit(init_tag=1, n_in_streams=1, n_out_streams=1, a_rwnd=1500) + packet.show() + + r = sp.sr1(packet, timeout=3) + assert r + r.show() + assert r.getlayer(sp.SCTP) + assert r.getlayer(sp.SCTPChunkInitAck) + assert r.getlayer(sp.SCTP).tag == 1 + + # Send another INIT with the same initiate tag, expect another init ack + packet = sp.IP(src="192.0.2.1", dst="192.0.2.2") \ + / sp.SCTP(sport=1234, dport=1234) \ + / sp.SCTPChunkInit(init_tag=1, n_in_streams=1, n_out_streams=1, a_rwnd=1500) + packet.show() + + r = sp.sr1(packet, timeout=3) + assert r + r.show() + assert r.getlayer(sp.SCTP) + assert r.getlayer(sp.SCTPChunkInitAck) + assert r.getlayer(sp.SCTP).tag == 1 + + # Send an INIT with a different initiate tag, expect another init ack + packet = sp.IP(src="192.0.2.1", dst="192.0.2.2") \ + / sp.SCTP(sport=1234, dport=1234) \ + / sp.SCTPChunkInit(init_tag=42, n_in_streams=1, n_out_streams=1, a_rwnd=1500) + packet.show() + + r = sp.sr1(packet, timeout=3) + assert r + r.show() + assert r.getlayer(sp.SCTP) + assert r.getlayer(sp.SCTPChunkInitAck) + assert r.getlayer(sp.SCTP).tag == 42 + class TestSCTPv6(VnetTestTemplate): REQUIRED_MODULES = ["sctp", "pf"] TOPOLOGY = {