From nobody Wed Jul 29 17:48:40 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 4h9KZK3mVHz6mZfH for ; Wed, 29 Jul 2026 17:48:41 +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 4h9KZJ6cs5z3hVh for ; Wed, 29 Jul 2026 17:48:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785347321; 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=GRcsPf7EsLcsZtEMQK2qk9cKEOH8f8Rgy9YUEOkMvnA=; b=TL/oDIR2mPO85DJwsbXu+9RFnRsHTR8uncvKd/hJIeZayuYnsIT8q/JPq9i29N5zqmtiPV SVLb5OS+QquJ3B4LECWK/BD+NF25alg8V6IyqMkjGDBau8bLlMBYae7CDWfGSrzRsER9zm mwK45mC821CeT59qQL37Qi6h8pwr0IxQHzr3+vZQs94efzFjAFd4tADSxzBYU/9ygKfC+E yupIpMTiU8FxgviwUy6P8+ICKONWnaMpIgwMH04moZrpNDQFgDeZ9zwaELGw64yDiR5rmS qPlaOXtcNGTDVJ5tXIhPS5N+gvoTKmkTWUYbWa/h8Ue5TpS2wuGoJj+fUAS+XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785347321; a=rsa-sha256; cv=none; b=lEDp2UOlCrtkCebRbi9+17NeWS8znE7yqyKy2Q2DqD1Lt2hDOwtn80dEJfsACaMIho7aTB OdfIiBszbAGSys4LEy0UV2dSDtUv8x+4cH1VlvK6aNyVYXQwvjKRR7DDrkB0nsLDHR8Q37 8ruYX+hB+Em/DFiuBIhMdjCHUASrw49VecdgwEv4ceM09F43Fo6EshFUw414uu4m9yUwUK FC+PM1mzqLBZKZR9yejY/h6YigU6GlHwI7804C8P6Qgo5+jSVRFj0VqLqh6MECzM4AyAfc HjRvek/nE/9s7PjpIjGksA1mhUxwLhr4wMEhu3wRYB0na2/16mOhSEPoyIjaVA== 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=1785347321; 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=GRcsPf7EsLcsZtEMQK2qk9cKEOH8f8Rgy9YUEOkMvnA=; b=aLICUaiOJbApgq/XgtjtuI1hl49xhfN5WOzf4XOdifwQ1cPECPiaQk0k9+MuBNo9/vVXRm Z02izscFAngBX57Gcp7bPiGgyl1Aev1Y2sN3+7RV/aflwSly3BU5rqK7m2sRH+Q+b1WzK1 ypqsuzhmYuIBFgZKD266h37KFUNd8Jv8yV0c4w4JKcGHSiAch1sKjewe5tkWflGPDW+pkh yM+MnMofDVpjHlOWixaMIGq6RkJpWjGvUnjDTBB9F2Ad/Dknh9ZM5LOeThMsdTyIf7K690 +MqDslbyye5Q41Af2dRvbUPILQ+dHSZaCJiUWUSzy5+/MOqs0skx1iVncggIHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h9KZJ5FMKzdPG for ; Wed, 29 Jul 2026 17:48:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b80b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Jul 2026 17:48:40 +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: dbd55933cbcb - stable/15 - wg(4): Check for crypto operation 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: dbd55933cbcb8d801a6e813a2dbbcf19f4e0f75f Auto-Submitted: auto-generated Date: Wed, 29 Jul 2026 17:48:40 +0000 Message-Id: <6a6a3cf8.3b80b.1a5339f4@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dbd55933cbcb8d801a6e813a2dbbcf19f4e0f75f commit dbd55933cbcb8d801a6e813a2dbbcf19f4e0f75f Author: John Baldwin AuthorDate: 2026-07-27 15:36:55 +0000 Commit: Mark Johnston CommitDate: 2026-07-29 17:48:13 +0000 wg(4): Check for crypto operation errors In particular, handle authentication errors due to bad MACs when decrypting packets. Since the current dispatch code assumes synchronous OCF sessions by design, explicitly reject any created OCF session that is not synchronous. Software sessions are always synchronous in practice, so this should be a nop. Approved by: so Security: FreeBSD-SA-26:52.if_wg Security: CVE-2026-58085 Reviewed by: markj Sponsored by: Chelsio Communications --- sys/dev/wg/wg_crypto.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/dev/wg/wg_crypto.c b/sys/dev/wg/wg_crypto.c index 53441ef25b40..82b80c7fd451 100644 --- a/sys/dev/wg/wg_crypto.c +++ b/sys/dev/wg/wg_crypto.c @@ -230,6 +230,8 @@ chacha20poly1305_encrypt_mbuf(struct mbuf *m, const uint64_t nonce, crp.crp_cipher_key = key; crp.crp_callback = crypto_callback; ret = crypto_dispatch(&crp); + if (ret == 0) + ret = crp.crp_etype; crypto_destroyreq(&crp); return (ret); } @@ -253,6 +255,8 @@ chacha20poly1305_decrypt_mbuf(struct mbuf *m, const uint64_t nonce, crp.crp_cipher_key = key; crp.crp_callback = crypto_callback; ret = crypto_dispatch(&crp); + if (ret == 0) + ret = crp.crp_etype; crypto_destroyreq(&crp); if (ret) return (ret); @@ -270,9 +274,14 @@ crypto_init(void) .csp_cipher_klen = CHACHA20POLY1305_KEY_SIZE, .csp_flags = CSP_F_SEPARATE_AAD | CSP_F_SEPARATE_OUTPUT }; - int ret = crypto_newsession(&chacha20_poly1305_sid, &csp, CRYPTOCAP_F_SOFTWARE); + int ret = crypto_newsession(&chacha20_poly1305_sid, &csp, + CRYPTOCAP_F_SOFTWARE); if (ret != 0) return (ret); + if (!CRYPTO_SESS_SYNC(chacha20_poly1305_sid)) { + crypto_freesession(chacha20_poly1305_sid); + return (ENXIO); + } return (0); }