From nobody Wed Jul 29 17:48:39 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 4h9KZJ08Gwz6mZc8 for ; Wed, 29 Jul 2026 17:48:40 +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 4h9KZH5NjDz3hKp for ; Wed, 29 Jul 2026 17:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785347319; 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=W8f6bi8qAamcglVkXD0AE4GDhO3yiHf6H0HX21gRQTg=; b=ahxVWNSzvHSlP96kBQ7eHaqZAlGC7KdbALta5RQA+Sg36jO2vdXM7fzIzYlu/eyeNmtQqQ boGs5OEpIJQSlrG09l5paU05Tzgr0DZpE+ZIIcG99nB3xQlI4ZbryUxh03jCGZFA6UXKN+ tQk+tiLDlecix3D4wmG0cY9Z0AF7JDYu/cIUk7vTo+pbg/8IPVmrUKzrxSen3mOu8I6+w/ e2Uhn/JCqOvFSkU3/jcFgoYNBJGb42tKjwaJd64Be49Ff/KtShCeB4HoJmYNYKrP/fXEIN gcWFT54qCt8wHPnFi+fUoSSMoZ8JUYEsnJpKL32ddF5QWgsC+q9N3/344/Sa1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785347319; a=rsa-sha256; cv=none; b=iR0EsVxsBnSzEoGbEfKWNRPEBWHiJ11MTK4DLW8sA++hgN/tFLclzOe0N2MX2+R4gHvEnN hvEo0Dp/2ZjUP+TWTSGlEYOKK1UQDQ/bV/FKkjC/FmAXukhNqgYdHjXWc6DHenrGQezewb Anp3hTmkRIvpUkwkOi2A8ACgjceAxyFtqN2v2RD5t2nKYh/bXkBKPayPEVGNVXE0FD9T3o +ngc9rZXkPdjOhKnsW4JYNz6CFIUYI31wJGFc03U/DJY9nC8dsFL2KCLNkT/HhiDuL2Vc9 TVcjlKcmb9Zp/kfEq8QEgi6rxXdToJar8dDDuFuC3etK6mWZ+7Va41q8GwUZag== 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=1785347319; 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=W8f6bi8qAamcglVkXD0AE4GDhO3yiHf6H0HX21gRQTg=; b=LRcBXIqAkb4vBlCBDk5R+dExjZ6teD6smWjXrD/O/f1paU0l5OVLlNeHQv+jr9cGzkchV5 vs308MWfsIfI4INBoRzTxZPoA4wmBHdrtAtczwWg7CBS8VnMhlfK1dvuyFiIgNoSwUI+Ut jayssp+AlFoqeoFYVXFxQjeli3n3j9nWag/CKpgIhFcuNpVPKOulLsztlUpgO0Pzi008An McTMLHctfgoZrh9RLVjdq5D8Ne9StgrnUg4gd76WLzla87GooEwYnXJUDXIv/naXPFbClC dguZ+2esRpIAylWYg+N+7A75tsXxdkSQmkQS0nr3bKq+hB7n8ElYZyDP8/585g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h9KZH4TGkzdPF for ; Wed, 29 Jul 2026 17:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38df2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Jul 2026 17:48:39 +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: cd144735858a - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: cd144735858a8721898ff3f3904b41546c78de5d Auto-Submitted: auto-generated Date: Wed, 29 Jul 2026 17:48:39 +0000 Message-Id: <6a6a3cf7.38df2.23de5ed7@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cd144735858a8721898ff3f3904b41546c78de5d commit cd144735858a8721898ff3f3904b41546c78de5d Author: John Baldwin AuthorDate: 2026-07-27 15:36:22 +0000 Commit: Mark Johnston CommitDate: 2026-07-29 17:48:13 +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);