From nobody Tue May 12 16:44:45 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 4gFMrZ0BZVz6ckTp for ; Tue, 12 May 2026 16:44:46 +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 4gFMrY5rLbz3sgs for ; Tue, 12 May 2026 16:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604285; 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=aIHpMFldcMXvMDXQSQTzY7E4Fgx6f1JAa6jvWjU1riI=; b=a3mvyf0IeeAbC32aO3XYhTKMmmmlOXhb1elXlc+3OFbrQ7x5AEiNPT0wfECGBnTmpVUYfj knt0IGCryVZqfLthPN08nDzpm8f1xSBHd6SrW9ChlRTRb51hg6eBdn41lKRYavnCE8cjl6 i24JQGUuH3DMDSQCyAWXz3BBqOlr8s2PJkshWmnYs0vDpHp2wkmDA+o7DKfP1DOwl87F8V qcmTCwSoly48v5b6OF95O8aW7UPuyFEECQH0i1cfuDE9rJvhnEclGfO7FqaZLregrea8pf SCJURVkqq43yxoPh+YBMNFlv8YPR2Bd1bVOU/ttUxYaLvxbn1AUU6K8zemNkjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778604285; a=rsa-sha256; cv=none; b=ZtDi6a6O9kOpdQzAkzDJln5rOURei6VHs3CvYVjpJwMOrD0XxPBLs14xQwtZs9jdpXxROz CMV3S6wb/nklLDH12xXhCThiL+PTsamrXd+w3I9LkXa+F5DqF+AWAFiBWyxnBWXk7WZH3f 1cOk/25tYyBi8xwXze8Pyr5aqNIBlRWKIwFuUl9V3FGLaRhkWEWABBEeqnQzIo1bs7UsvS BQh8utzRMyuL7t4T6jNkKDT7f5gKm0vF7FZiIAVUn5z84f5R0sYg74dxmRoNo7Bo9QBkS4 e/LnIIu6bt20QHX7EB2cF3Widw6y5Vz5DtXXHvBtLzhJKKhHehmidOI3LzPWCw== 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=1778604285; 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=aIHpMFldcMXvMDXQSQTzY7E4Fgx6f1JAa6jvWjU1riI=; b=s6stwmZiZS/0U08ia/fkKbN1mNm7T3QlUAfpcjIc3/RtloatuQgBuXdMHAVVFSWsPpNYkC lgmDm2R0CpFcPhXbvbOjapD1FSJ7UhC0b0BQQOe79su2ckuXiPbPTN/4Zz8GFUGsaYvnht SejvnRn6DCN/F+5EbDI/TCpDdbeIwSX1Wrg3gtjUJ7CSHtIZZBTdxs+phmWDjG1waEHy3Q RkWAkKEVPMucUXO7mQ18CoJ3BHo/q6bcQKRvzcWrYlVPDiQeqKtd0TyX5fqlKV/0hPaeYk 9Eb9gr37QAKjwslnJ07tuJrkgJXuzoaohUgX2nTgFCve+LFTHuDSMvLOXbMwtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFMrY5NZjz19kv for ; Tue, 12 May 2026 16:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d501 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 16:44:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 91d1c1c2b1e7 - stable/15 - pfsync: reject invalid SCTP states 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 91d1c1c2b1e74e776641a0923a9796b018c610d2 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 16:44:45 +0000 Message-Id: <6a0358fd.3d501.11255333@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=91d1c1c2b1e74e776641a0923a9796b018c610d2 commit 91d1c1c2b1e74e776641a0923a9796b018c610d2 Author: Kristof Provost AuthorDate: 2026-05-04 16:08:35 +0000 Commit: Kristof Provost CommitDate: 2026-05-12 07:54:34 +0000 pfsync: reject invalid SCTP states SCTP states should always have a src scrub object associated with them. Crafted pfsync packets might not have this, leading to us derferencing a NULL pointer on cleanup. Validate the pfsync state insertion packet to make sure this is correct. PR: 294989 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit bf6d00afdb6171ba04a1c5a7fde904cde87d212d) --- sys/netpfil/pf/if_pfsync.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 3edf08aefeb5..a5f377e84307 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -873,6 +873,13 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) (st->act.rtableid >= 0 && st->act.rtableid < rt_numfibs))) goto cleanup; + if (sks->proto == IPPROTO_SCTP && st->src.scrub == NULL) { + if (V_pf_status.debug >= PF_DEBUG_MISC) + printf("%s: invalid SCTP state from creator id: %08x\n", __func__, + ntohl(sp->pfs_1301.creatorid)); + goto cleanup; + } + st->id = sp->pfs_1301.id; st->creatorid = sp->pfs_1301.creatorid; pf_state_peer_ntoh(&sp->pfs_1301.src, &st->src);