From nobody Wed Jul 29 17:49:00 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 4h9KZh5mVlz6mZl8 for ; Wed, 29 Jul 2026 17:49:00 +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 4h9KZh1xLlz3jMK for ; Wed, 29 Jul 2026 17:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785347340; 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=0ic9fdCRiN2ZHAocFaO1rSSpQQb2wxchmhuFg/h2mjc=; b=yOX8zGJaH29wODaZlOF/uSHYgBg4waeblNUOs+VkOMKs1PflLHj0PNw6uLMTpoaRRx7LSY oUbU0X3OuwyH/bZFhTLxnOc8axcAy+Pr+5urmNYGWTxVXZ65HZ9oHAN15bha1LZdi75QUc pcbCExp6/RAc0OkToJQui8TFgyI6Yx/AcJF6zO4HtrjFynpJAKconY7QPUr8LF3XVo4EYh ICwwi7uhs0ya0NAWqz8NJtUJ4lv1OwDOqWd/yzkWkIDsoDfRCX0TUIgn9Y7W5onEiI5RUY tD2Lzqp24JoWmFe9S4bvVW3hHDFPtLf+Q2otoEg/JPfLgFViuZ9O9dUFZtCocA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785347340; a=rsa-sha256; cv=none; b=QmOHtNpI4e2KenP72LD+eQ9c/G4NE6lXAX69pp3nNYUDbe5S0Qexx7W5DbwVUrypbZwbNq oSWV4aHiiKa/gCPs/Od+y5yKgA58Zpu8WFEGe2/crNOIHnGHrEc7LzcE8x0rkjXw2v3BSu TxeR2/nxS5VCB0tAZgtzBxcRiR4zhOGGLOTjjtXiUYAmZKOEZTtD40OD6AX+eh47kzeQMI Aw1BoSx0aTU3UCbdFXkjtvljxoo7QLgO0JupxCXNmlThPqDLIUcKoj4tjBkIV1+XiCeOZe knXQFJ6cQgXbz/jFPGmWDYnonLR7nkDV67i6g2TSqt3xAK/SinfBIVujKZTlhA== 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=1785347340; 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=0ic9fdCRiN2ZHAocFaO1rSSpQQb2wxchmhuFg/h2mjc=; b=w/uO7uxJ0pSMEJzDON1gJQ8AvaQ+fA2phiD7IG8n2+mP+j6TRQJUetuWHkqCxFsJN0Y2Cs 66lZqusHgxfih/Gw4LfcWBvc4ACe1tYKUQvMm7Pap8lEohoTLN3AAUBLExOzp6U8maVpCO gkZrng9y9D5mfxLPa8n0lz4KuCRgOD1AY44fcC4l2p+8+9G84zUJBK6RZluwUQr6ZK1FXA HxIMsQYFbwxAqnt00N1D4dtbH3Hc9OxuhJB92jauyy8M/8nQxduQ7DHjsJgCE+YtMOexQI ou6bWI/7kuEdElt2sTxqhNQ/ZXgmwI6aMBjxFVGHyX6gREkbeheohFbb4KVpJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h9KZh0lFLzdLj for ; Wed, 29 Jul 2026 17:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ae8e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Jul 2026 17:49:00 +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: 88f1161ab0df - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 88f1161ab0df54b798a1aba0628b8a610e869729 Auto-Submitted: auto-generated Date: Wed, 29 Jul 2026 17:49:00 +0000 Message-Id: <6a6a3d0c.3ae8e.3a8b9715@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=88f1161ab0df54b798a1aba0628b8a610e869729 commit 88f1161ab0df54b798a1aba0628b8a610e869729 Author: John Baldwin AuthorDate: 2026-07-27 15:36:22 +0000 Commit: Mark Johnston CommitDate: 2026-07-29 17:48:54 +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 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys/opencrypto/crypto.c b/sys/opencrypto/crypto.c index e840d514fcd5..907bc34b7b0d 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 . @@ -1679,6 +1683,18 @@ crypto_done(struct cryptop *crp) KASSERT((crp->crp_flags & CRYPTO_F_DONE) == 0, ("crypto_done: op already done, flags 0x%x", crp->crp_flags)); crp->crp_flags |= CRYPTO_F_DONE; + + 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);