From nobody Wed Jul 29 17:50:06 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 4h9Kbz20pnz6mZxH for ; Wed, 29 Jul 2026 17:50:07 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h9Kby574Qz3lsb for ; Wed, 29 Jul 2026 17:50:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785347406; 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=dq7/OClNryU6VOETLUBpEYTeyh79ViEkF3g3uY/XsVc=; b=AinDBiS790Vw56cvWmmw1pLORnE0L1yuNry0LPDTRVD7x7uIh4dD9IQuTomgDwEJ/Rd6kA xLMVstdXPO+n8qGQDvMLlsM6vl7HwtDy2o7nMIe2A8wxaECuRs6wz5i0lp552htiE0Y0Mi Rs62QK3HhQunjrHccQkYxFrI1DF0eZrBkOnWjbbzoauCOLsOTvhgJ2bb9bz3yFvzUk8StD dmzJWOM+wV4ExZmXmKp0/I1l32Jcr+PLVELk8sqTHEkuijeBlnr4mF1DL/ZWxH9/Q35vCZ VoOYAynliw+Ey2cZBLS6lI34aw73OUxcKgH+S9jDdnqhLWjLGrwWzGGPMeiTyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785347406; a=rsa-sha256; cv=none; b=ET+jmhioSmUu72tGXX9+/eBwXsuaBcvv4Q561LnzP/p800dxobIl1oaWWeI7+VkEX2vALu CKsOcu4KHc9cIi3xeSIqiSMtPTa6xmVYLSlQTYG2tn0N6rGVzxHapdxTNxwc1ZQQCUmuxn 4JjcmfihR9LBdDm+UaXrNAndkM33OST8RwgTsk1tW1c2ij8glb86Xh3b8k+iZvCTspP2ja LRjQ4sa4DY8gndmMwOkZzq3RKkySBez52qDqhn7JH9z+nBYHq/kwA8oBRqP8gOZBDDCjj5 0rP65mckX99URjqzbGIOtIx6Q1NDChvVuhtmka0huA0CVkO1TMotdbYek+khjw== 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=1785347406; 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=dq7/OClNryU6VOETLUBpEYTeyh79ViEkF3g3uY/XsVc=; b=nW4eW8nknuPvRmbVYLx/1OkRkoYb/ljkXfw0d9ySI5R9CSVv62Sp+nCfxceS0PvUVQu4wT vraTyG+EDXGXEVf3zI0eW13BRtcqzK4ey9yYwhnBjDvG+AqMKG8Lf6kuz0pDwPUtKGI4PN BsgIZuXJ8QebGqxVl3sJ5DnO+xY/BvzMwox8jLLWGXAgzuo31vohAR5S5mDOuB8cCZ2LZM pWvzqfVHF0J243h5iumxtPhS8eS+TEpCANFNbHlU0KQq7UQ71p/OmHwDjUHx1GXL1s7HlK CDCsxV8biB716ntZ1aisVlH8xV6juHlFcTI+/HoRINcpXcpHMHds+9izSCVzPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h9Kby4Bl3zcJc for ; Wed, 29 Jul 2026 17:50:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ac36 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Jul 2026 17:50:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Mark Johnston Subject: git: 2864c9b3b511 - releng/15.0 - OCF: Add a fail point to inject EBADMSG decryption errors 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 2864c9b3b51140a62b2860d826fb91d405738956 Auto-Submitted: auto-generated Date: Wed, 29 Jul 2026 17:50:06 +0000 Message-Id: <6a6a3d4e.3ac36.253572c4@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2864c9b3b51140a62b2860d826fb91d405738956 commit 2864c9b3b51140a62b2860d826fb91d405738956 Author: John Baldwin AuthorDate: 2026-07-27 15:36:22 +0000 Commit: Mark Johnston CommitDate: 2026-07-28 17:34:59 +0000 OCF: Add a fail point to inject EBADMSG decryption errors Approved by: so Security: FreeBSD-SA-26:52.if_wg Security: CVE-2026-58085 Reviewed by: markj Sponsored by: Chelsio Communications --- sys/opencrypto/crypto.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/opencrypto/crypto.c b/sys/opencrypto/crypto.c index c3ae5e8a9ff8..9fa017902a19 100644 --- a/sys/opencrypto/crypto.c +++ b/sys/opencrypto/crypto.c @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -145,6 +146,9 @@ static struct mtx crypto_q_mtx; SYSCTL_NODE(_kern, OID_AUTO, crypto, CTLFLAG_RW, 0, "In-kernel cryptography"); +static SYSCTL_NODE(_debug_fail_point, OID_AUTO, crypto, CTLFLAG_RW, 0, + "OCF fail points"); + /* * Taskqueue used to dispatch the crypto requests submitted with * crypto_dispatch_async . @@ -1666,6 +1670,17 @@ crypto_clonereq(struct cryptop *crp, crypto_session_t cses, int how) void crypto_done(struct cryptop *crp) { + if (crp->crp_etype == 0) { + switch (crp->crp_session->csp.csp_mode) { + case CSP_MODE_DIGEST: + case CSP_MODE_AEAD: + if ((crp->crp_op & CRYPTO_OP_VERIFY_DIGEST) != 0) + KFAIL_POINT_CODE(_debug_fail_point_crypto, + inject_badmsg, crp->crp_etype = EBADMSG); + break; + } + } + if (crp->crp_etype != 0) CRYPTOSTAT_INC(cs_errs);