From nobody Wed Jul 29 17:50:31 2026 X-Original-To: dev-commits-src-branches@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 4h9KcS3Kpzz6mb3r for ; Wed, 29 Jul 2026 17:50:32 +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 4h9KcS0kNJz3mZq for ; Wed, 29 Jul 2026 17:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785347432; 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=a0pnncdfjL8aqMl6zfQVj2zNNQAtKVFHMGDHcj5/bzY=; b=Zs86f60oQGHCtf4u+o9/P6Ro/hTrxjZgC8QzoDgboOTwEGlmR6qyjYU+xCz7Ho7OiChq2/ lUaMdHgHz6t2s/QXl52DhvO6WTbV8ahwx2de9RTbvDvRm3tLAS9v1qWArEo7Ls8jnUsGPA nlXz2TGZ7DaNOSIDuAVUpMHO1nfIAOxXBLAZM7vBc/Yuh7jFiQHy+BN5VBRpO1GXrFAOua BFnoW56bvIhwecA1sV1APPwBcjePy1DeAEzeGNMIEIdSIlJpCpay/W9TfrD8CaZZKqkvSG D9VoHAtDHAbQhTvXc2OJwNZdbJO5PXbC3apa2/ltPdxDzJCW/4icZWdY6WbSxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785347432; a=rsa-sha256; cv=none; b=wTMc5fMtobjMaJtsj4qVvw5FsQoSRvpsINGaOtQ2VsGlHejEaLdkBckyAHn5rq48xUGUuB EV0R6/DzeJXneckJwFIx/CunWLCnF8T5bovSe8CvZtV95R5X/UW4DCYb/qpnrae1KagXIN SE0EQ9klS5JgBMu+taaItRHkzKyeT6s9Ue+D151ycWT5XGgqvoRDmQxnCYZIdS/xtc3+20 CIhWyYI9XRwuCj2CCPH9KysNCbqAmM5YOSHq9ULCyo4SfQnlglhyY/32Vs6EL4DWlRTzXB 52AhIoS1ezkqCz5fdtPzjFvYgTyIV7yU2BV5bXajn3YcFVCB+77LDLe7IkaEZA== 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=1785347432; 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=a0pnncdfjL8aqMl6zfQVj2zNNQAtKVFHMGDHcj5/bzY=; b=STdhqhah9rAFwWNOOmmdA+4bXjjOILeq32mOP1yjoV3vRud4IriqFI365Sl1axZQwpbIol CoAVQmW+YUpw0Bd8BeE+YydYjqiUqY0hissRwP/tpFWvxErXcsEHV4ngzna8GhaCokLa1I H6JVfTQZEiDnRz5eg3S0jCAqhKCI2T2L5SpFIkOZpQF7E7ujGPKokqMap2uS5jHCjokIse UjIL9UlRAU9sACPaEQP30EcqXdSYSIeT1C1erjJ20scMK8QOu/WGNM8j4HO+NYiubJagye OWfbLC/3jeZ3/PyevUWwKJHTTqvAwaUEa3y2cUG598a5jFFgAMbua9gdhTDVeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h9KcR6XVVzct2 for ; Wed, 29 Jul 2026 17:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c545 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Jul 2026 17:50:31 +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: 4cd9804b1d29 - releng/15.1 - OCF: Add a fail point to inject EBADMSG decryption errors List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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.1 X-Git-Reftype: branch X-Git-Commit: 4cd9804b1d2990ac727f8a01b28d59ce8f7d0827 Auto-Submitted: auto-generated Date: Wed, 29 Jul 2026 17:50:31 +0000 Message-Id: <6a6a3d67.3c545.613f8709@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4cd9804b1d2990ac727f8a01b28d59ce8f7d0827 commit 4cd9804b1d2990ac727f8a01b28d59ce8f7d0827 Author: John Baldwin AuthorDate: 2026-07-27 15:36:22 +0000 Commit: Mark Johnston CommitDate: 2026-07-28 17:34:40 +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);