From nobody Wed Apr 29 14:47:23 2026 X-Original-To: dev-commits-src-all@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 4g5Ks83Z7nz6bkCM for ; Wed, 29 Apr 2026 14:47:24 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g5Ks748Vyz4J2D for ; Wed, 29 Apr 2026 14:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777474043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LRJjkVP8y4pbcHAws8KYmAWBpXqmK0fUC2sxOU26clE=; b=ceXW6J7CF9ktJMU+OgcCHJFDwzYwhB/vRCfZ3Q1c62gqvi8MDFSw9XgvoYg60/2KZ6Ch+X anrpy25O09un2wCj9AdUJ3RXAi55IUuns33OTGQglqdvQHPSKq0g4VlLkQ4zA78AnTMMJy /lhPzLdanRO7rvHB9JdatqrVfDDuyJo5OY0ybwGIIBhfrfLtmFT3tNkC68xYG3JRJd83IV wisOMUZdtEGhMP+V8ECQgbjMipdm9rr8XthHAL2wCh5jJIQ9SRaQ3TnyudvXKBLGV0mXvm d23OWB2Ys2wMpiv+IKw0UnEpwtuPGmDmiQoDZffNx3cd6hQgOfxz0WwmNfbPOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777474043; a=rsa-sha256; cv=none; b=yIqkt2AHUdIPObdnHcTJSDD7V6pa1el+Nd+OrziVLChXF2foSkX8gxY8C4Fz+2Sd3+2boQ 4GCdRhFB08DQBsNAwD5oab9sFppTegRT9rdVFTqVCrnzKxTkeNokjuuQI6ptmDgXtwcX98 M2CjxbTIgvO1kW8vf/kBdSg2HH2ut6qdBMjVnaOWsrrq5KCGFpqTisaOI6WeOXtgk8acSz j7LxIFIGgaWpKLpAVx32iJ7tWtpOzAm2OW4X6HGxROdLL/N99vp0R5404RHLK5BCGgYWut GdiPEdmfpdto/vyyD3H9rgq9DYA6ZreTaRuDxRMjrei3lif4pVWOjeAKHdTe1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777474043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LRJjkVP8y4pbcHAws8KYmAWBpXqmK0fUC2sxOU26clE=; b=a8Qh70Y3WpkLBo4krWD+wEnGptHWi11nauakXpsYiXgnwun0pvEajG0CIB/qwfONLArRYk /cvsFiBJ9AEaPv2mPw1jiE/r3XH+8icKOu7WILGQTUFmVSJqlPJ1u62syNkJjJAtykx2YV ZNQp+ozbUkc+8tou6aKCBnefCpAcFjRyWDNgJ8ksW2zhVbug+J+XynlaKYCMH6+I4JUwMQ 3iIh1G26bO22ZqTvle306kTvh5/d4wSJC8rVfmnvMifCANnJfIQ2StO3/ETCH6IWpdSoN7 OL69Nv/XsM0BjHMuYCG0C6FxbKXJPE8SxTdWRorJK6aE3pgjdRP4BEts+hEIpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5Ks73cpbzkJv for ; Wed, 29 Apr 2026 14:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c9fe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 14:47:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Kristof Provost From: Mark Johnston Subject: git: 6f9ddb329b07 - main - pf: improve SCTP validation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f9ddb329b07099e392c78b6e4fef1c6252de0dc Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 14:47:23 +0000 Message-Id: <69f219fb.3c9fe.1ca10249@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6f9ddb329b07099e392c78b6e4fef1c6252de0dc commit 6f9ddb329b07099e392c78b6e4fef1c6252de0dc Author: Kristof Provost AuthorDate: 2026-04-26 09:34:55 +0000 Commit: Mark Johnston CommitDate: 2026-04-29 14:39:28 +0000 pf: improve SCTP validation As per RFC5061 "4.2. New Parameter Types" the add/delete IP address parameters (0xc001, 0xc002) may not be present in an INIT or INIT-ACK chunk. They are only allowed to be present in an ASCONF chunk. This also prevents unbounded recursion while parsing an SCTP packet. Approved by: so Security: FreeBSD-SA-26:14.pf Security: CVE-2026-7164 PR: 294799 Reported by: Igor Gabriel Sousa e Souza Sponsored by: Orange Business Services --- sys/netpfil/pf/pf.c | 16 +++++++++++----- tests/sys/netpfil/pf/sctp.py | 23 +++++++++++++++++++++++ 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 53f74271e268..27d03b688937 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8353,7 +8353,7 @@ again: } static int -pf_multihome_scan(int start, int len, struct pf_pdesc *pd, int op) +pf_multihome_scan(int start, int len, struct pf_pdesc *pd, int op, bool asconf) { int off = 0; struct pf_sctp_multihome_job *job; @@ -8458,6 +8458,9 @@ pf_multihome_scan(int start, int len, struct pf_pdesc *pd, int op) int ret; struct sctp_asconf_paramhdr ah; + if (asconf) + return (PF_DROP); + if (!pf_pull_hdr(pd->m, start + off, &ah, sizeof(ah), NULL, pd->af)) return (PF_DROP); @@ -8467,7 +8470,7 @@ pf_multihome_scan(int start, int len, struct pf_pdesc *pd, int op) ret = pf_multihome_scan(start + off + sizeof(ah), ntohs(ah.ph.param_length) - sizeof(ah), pd, - SCTP_ADD_IP_ADDRESS); + SCTP_ADD_IP_ADDRESS, true); if (ret != PF_PASS) return (ret); break; @@ -8476,6 +8479,9 @@ pf_multihome_scan(int start, int len, struct pf_pdesc *pd, int op) int ret; struct sctp_asconf_paramhdr ah; + if (asconf) + return (PF_DROP); + if (!pf_pull_hdr(pd->m, start + off, &ah, sizeof(ah), NULL, pd->af)) return (PF_DROP); @@ -8485,7 +8491,7 @@ pf_multihome_scan(int start, int len, struct pf_pdesc *pd, int op) ret = pf_multihome_scan(start + off + sizeof(ah), ntohs(ah.ph.param_length) - sizeof(ah), pd, - SCTP_DEL_IP_ADDRESS); + SCTP_DEL_IP_ADDRESS, true); if (ret != PF_PASS) return (ret); break; @@ -8506,7 +8512,7 @@ pf_multihome_scan_init(int start, int len, struct pf_pdesc *pd) start += sizeof(struct sctp_init_chunk); len -= sizeof(struct sctp_init_chunk); - return (pf_multihome_scan(start, len, pd, SCTP_ADD_IP_ADDRESS)); + return (pf_multihome_scan(start, len, pd, SCTP_ADD_IP_ADDRESS, false)); } int @@ -8515,7 +8521,7 @@ pf_multihome_scan_asconf(int start, int len, struct pf_pdesc *pd) start += sizeof(struct sctp_asconf_chunk); len -= sizeof(struct sctp_asconf_chunk); - return (pf_multihome_scan(start, len, pd, SCTP_ADD_IP_ADDRESS)); + return (pf_multihome_scan(start, len, pd, SCTP_ADD_IP_ADDRESS, false)); } int diff --git a/tests/sys/netpfil/pf/sctp.py b/tests/sys/netpfil/pf/sctp.py index 9f1d7dea4ef6..722f7777a305 100644 --- a/tests/sys/netpfil/pf/sctp.py +++ b/tests/sys/netpfil/pf/sctp.py @@ -618,6 +618,29 @@ class TestSCTP_SRV(VnetTestTemplate): assert r.getlayer(sp.SCTPChunkInitAck) assert r.getlayer(sp.SCTP).tag == 42 + @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) + def test_too_many_add_ip(self): + import scapy.all as sp + DEPTH=90 + params=[] + for i in range(0, DEPTH): + ch = sp.SCTPChunkParamAddIPAddr(len=(DEPTH - i) * 8) + params.append(ch) + packet = sp.IP(src="192.0.2.1", dst="192.0.2.2") \ + / sp.SCTP(sport=4321, dport=1234) \ + / sp.SCTPChunkInit(init_tag=1, n_in_streams=1, n_out_streams=1, a_rwnd=1500, + params=params) + packet.show() + sp.hexdump(packet) + print("len %d" % len(packet)) + + r = sp.sr1(packet, timeout=3) + # We should not get a reply to this + if r: + r.show() + assert not r + class TestSCTPv6(VnetTestTemplate): REQUIRED_MODULES = ["sctp", "pf"] TOPOLOGY = {