From nobody Wed Jul 29 17:47:54 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 4h9KYR29zxz6mZdY for ; Wed, 29 Jul 2026 17:47:55 +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 4h9KYQ70V1z3fs0 for ; Wed, 29 Jul 2026 17:47:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785347275; 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=OFwz4SvVaDkuqgRUSSJbk1AG/VwQY9Zb25iTfx6Rq8k=; b=LgECOgqO0pAWZZGzmJTPBy5KqVUYW311/9l98HK73x9x26uWCPsSYzNmZottCZO2meq8TP 882cwuBq+E3Ez2Ekm1reyl4ZpYuUmBvP7KLsc8BUcvmXNF7pV69R43oEnlfUzxiaYvDsdn tlOHPJveRiYN/4MvK3+LdRDbsaExEbttKk+ejmYQ76v55sru7r2KFW4wFbXZE930XQjrnY X5SsrIGCGUzFhbYJDWUkIAuPCx/UtRT5VtlfYXK8/fZoDjr3SpcqxUtNJZr0JizsR6/Bme CokV44HLAd+2KuyRDVpx7pnwIWvtq+GnB3WZmfqStsE1K3OjRukDaVA5VIVzsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785347275; a=rsa-sha256; cv=none; b=FWU4388RpBCxBCTQptdAaDE5f9PrPy52NKH6CpgBBKMADICMEvU3PrtQ10qLhGV83Ko+/B cAyN12Dt3PqaOmiHJASBh79lAG0gtrgygJj8Z1yIgPEL2MSfoRU0a8osVEBJBFqkTOf4YV /60UKtKsd0kBTicobLI5W02jwsnqKUGBI/IOp67lXbAiJa7GmEXhRTW4TPGNJLit2uF7y8 IRcZ9/Dq34OP6Ol/i7scTtNcmqmKSrCiFbO5g9P2y/jortCsmEK6gUdgQX4NMq4JV/Z34g TvVqBG6KoSKCaZVDrLhs4g6n0zorQ6jHfFXPM9xYdT2Y8EiEQC2cCXNOLb3zAg== 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=1785347275; 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=OFwz4SvVaDkuqgRUSSJbk1AG/VwQY9Zb25iTfx6Rq8k=; b=ypaJ4mXQ8ZK/ZaPT+rnTQu4bNbtp/GV6jWxdhszBv3t5QrkhBJvZmO3pUflLtYX+0I2qAR 1giMDIH7xDtzp46pVkbkiZIYTHF8puiGMUWs8qAfj9Z4knUgusF6vjr66gBL8Y6z0ytJpM mMrKKacR+C0mWeLr9PquZgZBrTDxlussmk/biyxTf2j4eFlU8IIgF/D+muFepR7sLECq5X 4PsJFopFZfV8Jy0NzYgCyU+jYqyhlBNmzu4uK8jBXsaG8+rGqLhJbQ/OQd9B7phIPC188C wVVHAXIjIFLImYb9WZwSl4p9yy/EhnkqmndPEBuNoYx1etx4gJ8ZE9exE+ihvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h9KYQ4qf7zcfS for ; Wed, 29 Jul 2026 17:47:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3babe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Jul 2026 17:47:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: John Baldwin From: Mark Johnston Subject: git: 98bbfef2ea33 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 98bbfef2ea33a42b7f06ad3a64c892108ede8871 Auto-Submitted: auto-generated Date: Wed, 29 Jul 2026 17:47:54 +0000 Message-Id: <6a6a3cca.3babe.597984ab@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=98bbfef2ea33a42b7f06ad3a64c892108ede8871 commit 98bbfef2ea33a42b7f06ad3a64c892108ede8871 Author: John Baldwin AuthorDate: 2026-07-27 15:36:22 +0000 Commit: Mark Johnston CommitDate: 2026-07-29 17:45:02 +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);