From nobody Wed Apr 29 14:48:52 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 4g5Ktt4sNnz6bkfj for ; Wed, 29 Apr 2026 14:48:54 +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 4g5Ktt2fpsz4K6D for ; Wed, 29 Apr 2026 14:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777474134; 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=5ifGJ/+idAism9Dvwk6oyoSIoqKf4cPnzDUQXKB0ejs=; b=uI7ub9X7Y0cP9qRDo0KJoBnmN48YwlUiz+tpvchn1I5i27DfNY22Xsdgoe2w1RMdhNZCES U2sZGBumSiotbz1C+GAO78nQDr7Pnks4+leudAzFfbdYoK/BsWFZJTTjb26CncA36rJecT IwTX3ss0g9OxzmiKdcbdZd9CCbqCCrNVAjqBYAU/VSJU2KUhs8gMEdavrmz3OWuj04RM0R K0cFjS0fX1lOdSmaERIL5gbzHwN9qXtEQBZB0opM1rQ5d4SgDfwT9CmWz6e3cEnk9u0eni 8ixqGvQkyPI3ES73hN+acI+6Gv/sAWRLRnYi+zSmS5dhA0Ht7d8LP7jDZbRpSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777474134; a=rsa-sha256; cv=none; b=HBbQGQIoorEpBxylcTODZTm83Z0z+ibrPyUYIsMx0yMQGZKP9JvsKZMxWmQ2D8uT6Qx/0e uWx/TqYHnu7/WrVv/UpQzkDByWYRu6Y00Gc3vJ2V5B4+p72SgjVqRuLvs8LABMCePoyMLB FaoW/KcEiqrJEHPBqwtVObDR5oVBTA7q2Dj1X/8JiRGaUx8M/ZVjslZ0jpVZjOkl34q7ig bxpNRsG/1/HP58qvRmCJU2ujVevCV+4BddmdJEyGZZLQh8RTk0g5PQ3LpMqFl0JFNyn+SA LMmZJQDfVTaMzMDx2BT3I0CBGgQeGTyAKBRHgoRjjjJwLdhePoppoPH7tCbo7A== 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=1777474134; 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=5ifGJ/+idAism9Dvwk6oyoSIoqKf4cPnzDUQXKB0ejs=; b=AX4oo3zgVuZaCYebqv3TqO6ChIL3l95/eH5mSbpitP1BZ7xkaCj3y3Fg7OFJdFSAbQkCX8 neR0Wg2BLiqVX3opcZZMvkxmgD4ofL5xpDeH0EIKyRrgS5nrV/YbvG3lmS9hYQYJRNoQgg c+zEycqW3LWAm1VBftadh5d+XgHmmf0oP+UCxDWzytfCR1AER5Y4pJIVC4uK4eAeGJqpg/ CdbphGIJY77wm5we/yvzpcsXepvkrJBEj71tLGww/mXHy010g1AE1tgGE/sTbgZDN+HPHb +6fmNVV8rSI6GYvXT1etkDueeJGJpS7F7BAmYBENjK+WPELA4V15YZejBzCAFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5Kts2qkGzl5y for ; Wed, 29 Apr 2026 14:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ceb7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 14:48:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kristof Provost From: Mark Johnston Subject: git: ba21845e94dd - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: ba21845e94dd165c94d8d610d5df49b8954a405e Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 14:48:52 +0000 Message-Id: <69f21a54.3ceb7.115d067c@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ba21845e94dd165c94d8d610d5df49b8954a405e commit ba21845e94dd165c94d8d610d5df49b8954a405e Author: Kristof Provost AuthorDate: 2026-04-26 09:34:55 +0000 Commit: Mark Johnston CommitDate: 2026-04-29 14:45:04 +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 MFC after: 3 days Sponsored by: Orange Business Services --- sys/netpfil/pf/pf.c | 18 +++++++++++++----- tests/sys/netpfil/pf/sctp.py | 23 +++++++++++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 38e4cf3a6801..3eab758296a9 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -6597,7 +6597,7 @@ again: static int pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, - struct pfi_kkif *kif, int op) + struct pfi_kkif *kif, int op, bool asconf) { int off = 0; struct pf_sctp_multihome_job *job; @@ -6700,13 +6700,16 @@ pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, int ret; struct sctp_asconf_paramhdr ah; + if (asconf) + return (PF_DROP); + if (!pf_pull_hdr(m, start + off, &ah, sizeof(ah), NULL, NULL, pd->af)) return (PF_DROP); ret = pf_multihome_scan(m, start + off + sizeof(ah), ntohs(ah.ph.param_length) - sizeof(ah), pd, kif, - SCTP_ADD_IP_ADDRESS); + SCTP_ADD_IP_ADDRESS, true); if (ret != PF_PASS) return (ret); break; @@ -6715,12 +6718,15 @@ pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, int ret; struct sctp_asconf_paramhdr ah; + if (asconf) + return (PF_DROP); + if (!pf_pull_hdr(m, start + off, &ah, sizeof(ah), NULL, NULL, pd->af)) return (PF_DROP); ret = pf_multihome_scan(m, start + off + sizeof(ah), ntohs(ah.ph.param_length) - sizeof(ah), pd, kif, - SCTP_DEL_IP_ADDRESS); + SCTP_DEL_IP_ADDRESS, true); if (ret != PF_PASS) return (ret); break; @@ -6742,7 +6748,8 @@ pf_multihome_scan_init(struct mbuf *m, int start, int len, struct pf_pdesc *pd, start += sizeof(struct sctp_init_chunk); len -= sizeof(struct sctp_init_chunk); - return (pf_multihome_scan(m, start, len, pd, kif, SCTP_ADD_IP_ADDRESS)); + return (pf_multihome_scan(m, start, len, pd, kif, SCTP_ADD_IP_ADDRESS, + false)); } int @@ -6752,7 +6759,8 @@ pf_multihome_scan_asconf(struct mbuf *m, int start, int len, start += sizeof(struct sctp_asconf_chunk); len -= sizeof(struct sctp_asconf_chunk); - return (pf_multihome_scan(m, start, len, pd, kif, SCTP_ADD_IP_ADDRESS)); + return (pf_multihome_scan(m, start, len, pd, kif, SCTP_ADD_IP_ADDRESS, + false)); } int diff --git a/tests/sys/netpfil/pf/sctp.py b/tests/sys/netpfil/pf/sctp.py index a871994ee118..30794f04fcc2 100644 --- a/tests/sys/netpfil/pf/sctp.py +++ b/tests/sys/netpfil/pf/sctp.py @@ -597,6 +597,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 = {