From nobody Fri Jan 17 12:06:13 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 4YZJNk29Mkz5ktR4; Fri, 17 Jan 2025 12:06:14 +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 4YZJNk02yvz3QJB; Fri, 17 Jan 2025 12:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737115574; 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=dcADDBO99IGHnc7hRWu1xiJqPWX8A4rQqtbjppV5kp8=; b=U07xyG1Kx+mduBCrSF2Y/bnM9CCd0XuaQeiqskDkxHlbVmskM3DwxllCec3/0U31Q9m/1W EHlUNs8Y3bWdu9lBWqWaJkNYAnrBbSxIMitw+D5WU+83W4xaD3bC5L6+lcSXHbIdUGv0Qq dllKgKYkhd6I3VOAFAELeuFYAOGmTPgtxJFbe1hzorWkSy1pUrCTF/5+40QiHYk0XrfJCR sKwH+BqUzGxnyhM3pRPbMmvbOp5vlEreQrJ4moBm8w9nnvDUN0LYAiJfy9f54YjgffuQaz VatwVWK7Dav4oUdy9HiDbYn8cHBdeBSIIQ78e0xsrrjMkPHZXQOLuJ5LeKxIpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737115574; 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=dcADDBO99IGHnc7hRWu1xiJqPWX8A4rQqtbjppV5kp8=; b=ftE2T6gJ9PX976yzaUK1vxqynP4y5F+eseDVRFasMewUlA9T9AXrOA6wlaamNfdFmeYG9V 0gIPYMe8P5xLl111alP2Ib8XRzBLZxq7O145P2OLcs3ZWxOuTrbzoahPV9bfk2xbZO3e3t T9F0+9bA74i+XvP/u4xT3SZNxTIh7TzQMJMb69kDoS5F+TtmmZuOFzZ3YFZ8OCauO5wTmq b5F3anpN+AbnlKp/lnVeF+3hDLD/rqXMiz8tqGzLjAh/wreS+1Bb2tIyf86QCt6ocYdR0Q HzgscAzqHwEtHwzPEdz/PMaDUTYkulQwq2nEDjn6CnVPNJ+/SEGI59b8BM328A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737115574; a=rsa-sha256; cv=none; b=qYakDyyvIZCtEpQw4A9KOpEF4SAnkND+CVL14fs+68CB2Vt+iJwM4a5Z75pafEgxJR++4u bl0GQUwg1wvoJcoByM8MM8b9y2LcuDPZZ5X9IvJi88E5WlX4IJ3/VBs0ijyp3lG9GV0aU8 XU6m19tKRguv4upkzjPT6zrciFV31kQACsvqs+xhoUN4sRQNedNQT8RzTDb38YerjHlwGz WbVgfhM8RxXq+8utsCLW6uTNeAFdIlly6yvt2xf3dt+eViw6oAOgGNb1ik0ZEBfn66G0Ma j+ohCPivnxl+NpE9vyitYTKJFzTsjEK89fPtLPxdaui2r4xBMNXMacwu1r+QSA== 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 4YZJNj6k4Fz1qj; Fri, 17 Jan 2025 12:06:13 +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 50HC6DM9015310; Fri, 17 Jan 2025 12:06:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HC6DHg015307; Fri, 17 Jan 2025 12:06:13 GMT (envelope-from git) Date: Fri, 17 Jan 2025 12:06:13 GMT Message-Id: <202501171206.50HC6DHg015307@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 541ea3d7828e - main - 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/main X-Git-Reftype: branch X-Git-Commit: 541ea3d7828e0ede161ac2d8ef3e8419657ef5cb Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=541ea3d7828e0ede161ac2d8ef3e8419657ef5cb commit 541ea3d7828e0ede161ac2d8ef3e8419657ef5cb Author: Kristof Provost AuthorDate: 2025-01-06 09:06:01 +0000 Commit: Kristof Provost CommitDate: 2025-01-17 08:40:29 +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 --- 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 9f1eaf7c4d76..c9a7f7d2df04 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -2138,6 +2138,14 @@ pf_scan_sctp(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); }