From nobody Thu Jan 30 11:02:00 2025 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 4YkGLd4bpHz5lyW0; Thu, 30 Jan 2025 11:02:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YkGLd0nb0z3gpd; Thu, 30 Jan 2025 11:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738234921; 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=ICHm74rZ5L9aQnsmHPjLTndgOPaUaZvT+GD5brLGVzs=; b=k3KUWxTs0Wy3wuQC78/LH/nev4tOyyXnKwu4K87a662bRBtSEQuje0kuObw2dZA4t0Z6RT OFsSlLSDnMy//HYSTSDRXlxFAM1Qsw+ZY8FnuIJLxjVmf68sL9+ICfPphwx0E/bGRcXB/9 cJrfR3nQJt4LPtNj4zDv9TMthdgAeJySoBHYKEiGTuEeUx0l+LeJep32ef0Z1zQrfKkjBc CAozZUi4rndg9i+0M6tSNzwvhcEsDGeXsCOLRSBbJx0Ns6CCL7LiI1c7szOML2GkNCspi3 VKtvd8SK41sCtPWrgUqYem0Dg2ytow8UyerhwcBXllcX39zThmZLOnu6PrdQfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738234921; 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=ICHm74rZ5L9aQnsmHPjLTndgOPaUaZvT+GD5brLGVzs=; b=PYgh6ie5GGGzxd6Wo3pcdVQRu1mNBHfRSJut+qW1EDzRtUxtd7mdfLneEd81NpqHpQfLUQ zUampr1Mat++EInCo7Ko0ijGzlNOc9419ged+seTKvlHIHnQQ+KiVgKEKclX76kyC4yA4p F0M4I79tiW2kN82ixQ8w7b0XolVMamLdNnmuXxt+ABFcs55jMLODc94MQEYR8yfMZUryoz A3nXk+eBwKrykQOSCWAtiQegMpTTuCKyOEXYjm6kGlqnQVjyjNaB5LG1gKPEkZ0Ewjo7Zn bicvLqb9w0f5BmKKqSwLJri2sYorF23VhZ9maXVEamDXSE5vG3ZQj0lVqJb2ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738234921; a=rsa-sha256; cv=none; b=fjGwMmj1PeUp9pa1WXxwWo3ghtdosZHyOpTXUeXKPcChqhiF5/qPiLpbT/7UNN10P5cRZo 2pfb2N44lF89TlagY2L3NiHenz+wVk+vl6lAe9r8x6uqeo5GiYogVYWEF7cKApx5i1oKoQ 2J3c+uapUSM5W6mhnsfguC9j9BUTggb3w2Cvm7zcd9uHBdRmxU8b4ItxnKm8E6v/LGTvCv ln3YgjEEgj/NvDYw2b7aKa16VRnx30fsZHfWVwWgkVoBbFHwQy/Yua/BRnZtj5m8V2t8Dc danulhQx0n8OXswGSzbMlMOcmEZyGwK5zotaQaZdebceccjL78buyjFYIQXmxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YkGLd0NvvzlKw; Thu, 30 Jan 2025 11:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50UB20Oi077913; Thu, 30 Jan 2025 11:02:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50UB20wX077910; Thu, 30 Jan 2025 11:02:00 GMT (envelope-from git) Date: Thu, 30 Jan 2025 11:02:00 GMT Message-Id: <202501301102.50UB20wX077910@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: fc167e91313c - stable/14 - pf: verify that ABORT chunks are not mixed with DATA chunks 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fc167e91313c7c544119f524ae5cbb2439734352 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fc167e91313c7c544119f524ae5cbb2439734352 commit fc167e91313c7c544119f524ae5cbb2439734352 Author: Kristof Provost AuthorDate: 2025-01-06 09:06:01 +0000 Commit: Kristof Provost CommitDate: 2025-01-30 11:00:30 +0000 pf: verify that ABORT chunks are not mixed with DATA chunks RFC4960 3.3.7: DATA chunks MUST NOT be bundled with ABORT. MFC after: 2 weeks Sponsored by: Orange Business Services (cherry picked from commit 541ea3d7828e0ede161ac2d8ef3e8419657ef5cb) --- sys/netpfil/pf/pf_norm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index a92462c53f15..de4df7ebf4de 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -2171,6 +2171,14 @@ pf_scan_sctp(struct mbuf *m, int ipoff, int off, struct pf_pdesc *pd, if ((pd->sctp_flags & PFDESC_SCTP_SHUTDOWN_COMPLETE) && (pd->sctp_flags & ~PFDESC_SCTP_SHUTDOWN_COMPLETE)) return (PF_DROP); + if ((pd->sctp_flags & PFDESC_SCTP_ABORT) && + (pd->sctp_flags & PFDESC_SCTP_DATA)) { + /* + * RFC4960 3.3.7: DATA chunks MUST NOT be + * bundled with ABORT. + */ + return (PF_DROP); + } return (PF_PASS); }