06c::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 4g8sK41yLfz3fwb for ; Tue, 05 May 2026 08:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777970120; 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=9R17gzRVXnEjbcwUurAsbeO0iYSyIXbhHlOeEUaXFus=; b=Oz/nWkge8fURjOdszv90ILJW51xXtnLq8TJsOHE0KrRFQMvZ6wqfYzB+2i89O5E4LOHnBE eX1/yE+rNhB4RvlAUErXK0sLuYp2n5VpQiJsMtPs3fvP2H9gimw+CXaHNcI3hVRhjZoLCv jX1lnbPr+QqYKhkmN1glF4FggYHTTL0g2HVkdrcayLKDJwcMvl5OVjp5+6WwzhVYhvvecc DORLnVsjt1gfEenvhJ4y060u1JKOPl79UCtku4eyugLzFACHybIBhBYZ7N/wlFISEEedzF VS6UCDaBofayuiM0FtdczDTXJLkClKQHOQJaPhp2zdTrKC5dIov+Q7djeHVcTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777970120; a=rsa-sha256; cv=none; b=TtoO8GugzS2rd4cFiJIblrzFlukVhb2MPffXtcpTZfg0u/2Ew8rSOud2SI2byp+PaRUq3b GO67E6oMxfx8IgF29PB5Sl7zdjOUoJwam5WtobJ2RqH5dqJxNiA1GpF5m/oXnEWjpq9t+9 LKcdC8J5HTj/5fCJ00PoSgz0zsgIOAXhHh/eowCDSB1i7aQ1NYqGPlc9vsjsKQ2RSCpCf3 ov+URaN5GWhuQ07DjVmFT3BxCX8qAaVQ5TTF8bYAGwb1MUjSJNBxGhTLbA78ZbcQJktjxQ PkTd4HXhqSYjZz2OjzL5MzvcqszinJLNAf2ucglOA4IYqRy4jfK5GKZZ2a7kvA== 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=1777970120; 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=9R17gzRVXnEjbcwUurAsbeO0iYSyIXbhHlOeEUaXFus=; b=b1N1ujeUHbx1WjCAlvLwMB81nK+G4d4C6jf2H4C2Bc24sz3uvGAzcy1dIOjvS/QLz+N07u 21JW16D8UkA/UVaAk/JEhaODRZweyUltGZudri5E6TYheW8UcMvHXNuGzxowOIIUEZEeQ9 N5SaOQVyY9v9ITY//WS2AGl5enDYahORCndCxRypjfAhz8EC7gnBcevVmO2LXPsD/YJfYE IP4Ut1ndH9UdT8LOSkabt6vd961lU2HtwrUbGLMUOmenn9n2qO2oJEN1CB32okLbzxnHxQ 16cO7hZD5JZ9dXwU3w9Vd0DEK9AHANTfio1ol9pZnHmPv2bgBduXMPTOSCdnjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8sK41S9Bz10N4 for ; Tue, 05 May 2026 08:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18ab2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 08:35:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: bf6d00afdb61 - main - 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/main X-Git-Reftype: branch X-Git-Commit: bf6d00afdb6171ba04a1c5a7fde904cde87d212d Auto-Submitted: auto-generated Date: Tue, 05 May 2026 08:35:20 +0000 Message-Id: <69f9abc8.18ab2.14fea4eb@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=bf6d00afdb6171ba04a1c5a7fde904cde87d212d commit bf6d00afdb6171ba04a1c5a7fde904cde87d212d Author: Kristof Provost AuthorDate: 2026-05-04 16:08:35 +0000 Commit: Kristof Provost CommitDate: 2026-05-05 07:45:29 +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") --- 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);