From nobody Wed Jul 29 17:49:34 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 4h9KbL68HRz6mZg6 for ; Wed, 29 Jul 2026 17:49:34 +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 4h9KbL3cR1z3lCR for ; Wed, 29 Jul 2026 17:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785347374; 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=3fG01p6CkakLc9v5ooJbJwpRC0kiwrEx4TO1ugbpCw8=; b=QCllIEZH4I6OUuO0txyvxZugpa/w2PBg/nR+BEvQWgu7rUnzkMc/a5oiYy+t8CZvFFQ688 pxRgyjDOLZKAnupmnVzCh34h+GIkyf7zVzcQBrtPE7ayvv/cKLBdAQw+uZyhA6V0Rk2dFA VtFkMIoY7xNih4rcbFU1hPkgOLxfhV7E6rw1gphyXl5yukRuFpYYoBRTQX8Fx6DR9wlhZG 25I7PlVbgCabkmxqHw1tP6NexI8VLvsUX+b+JC+P+GrP5NdCOW+MXIBY8y3aoVFBs9hCr7 slH1SfxbaDAFC6Aiu9sPLfp8FDyEhOSit1rrPR2f5q9aMFOIUm9bKHOsG7b+TA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785347374; a=rsa-sha256; cv=none; b=yAwDjS4Camgl+VB+GfEcnA82p60P2XtOvst10+1jzwkULW6h/mtI35IyjFeNJtz+dTePMi EdOwmf+9NT/+O7uN3ODZUV5IZoPKN+NTDxB8CvtB2JefrzR0y13quoXpk0pJx3v5gtDAFX ghPyTz/+zx21FVdsBsjs1I6Wua48KcRK49M59DvMbC5XWItM3x0riLAmyHGFikHeA4dK4C 2hhNpV9Lp/2lArQAy/w1szU33adfcZqS9qw6g2GeYLyIWLn0usd+REgqMHK1od8dO2zn2l FyvUvTy00VVqp5hf+ErCwIGV0isR6A+BihK/mk48sdVHwEk50hexM9ZIJQ70Yw== 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=1785347374; 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=3fG01p6CkakLc9v5ooJbJwpRC0kiwrEx4TO1ugbpCw8=; b=Mu+yYC4WiGULm7dleD8BMkIKImi8q5S+7idOs+3UJD+Csjc0DElw7owxI6gs3By725k5zl aXbCApMFCGgRVd7ltyAjvFZH4pe5zEbtzQbTZUjdFQ7Oed68+UILSzHk8d5Drd3wImyqVl 9UuhbpLanLHNQuuO5MPYzthgVOb54gF4fTXwsl/OpmdbMD1/2cIchGbhaaBv76hBpGWAkU /yzhipSaD6DS1LHd1eca02SNx6C2TEflJ4jTyJA19AW7MIvMT9vPwzpfj+bnB1ASO2q+Wu zZnoUfbMFqK/8hgvIwrt3yrFRIqBalGmd0/mk8p02y4UZjxboUbCEtkcLKvYgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h9KbL2TRdzdPN for ; Wed, 29 Jul 2026 17:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b810 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Jul 2026 17:49:34 +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: 4ae10ff966b5 - releng/14.4 - 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/14.4 X-Git-Reftype: branch X-Git-Commit: 4ae10ff966b5f1b40356b9fd04696ba40f8b69b3 Auto-Submitted: auto-generated Date: Wed, 29 Jul 2026 17:49:34 +0000 Message-Id: <6a6a3d2e.3b810.43471a06@gitrepo.freebsd.org> The branch releng/14.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4ae10ff966b5f1b40356b9fd04696ba40f8b69b3 commit 4ae10ff966b5f1b40356b9fd04696ba40f8b69b3 Author: John Baldwin AuthorDate: 2026-07-27 15:36:22 +0000 Commit: Mark Johnston CommitDate: 2026-07-28 14:38:26 +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);