From nobody Mon Nov 09 00:53:36 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 4jNB9Y0Bv2z70Fcw for ; Mon, 09 Nov 2026 00:53:37 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jNB9X3nFLz4j9k for ; Mon, 09 Nov 2026 00:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794185616; 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=ijKvB8lxW5t1mOMD2kt9DDBaCHwlKo30guhk8z8IEDQ=; b=H10bSGWFcvWCHZjUcmFVVGGKdegTqB39PBNgOmKrMjSvMxsFRNFmxkX+Li4dUpkV+KRjvP HbyyYVL6L2u4Xln7M/ci3sF95z+HIjIju/Pc6H6A6ZMSzTaFSH+NY1SLhfx/nWuj4h8nKG 5UZjlg0YmkieUwGGrBRizaBDjAy/6gpfkZox5v8hs/EZI5cP8iRhXuL1dSU94OdxkFD3+X yrTO3P6fSz7I/LRyvpcSnUDfFSTC1vQa9yFX+sai2sGdEv9HLiIbqASW/ZenKnNOmCN3ta EVCQ2lnLasv8WXDSUkUWYkZ1A0J+JqvgKFzkMHGzR0DSwnyKyufD2FxQ6iTexA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794185616; b=KkPnR90CiGK1J4sSn9Fmud0yafIuBSWF9QCPf2uuTaOyBXtlWFRempnHcC880JqmXdWCHq A8hqsP+Yy06F7K95O6hxzohgopPRjxgNss+2nJORMS3UxcbQkPJ70DleQVVFl2liuiY2qJ zyQSGQDQJ0YR7NX40hCHiydj61xYJdBoZhimQCJXeb+4XLHWawccW8trjeoLQONlpeDRFZ wHDncQpDwZivolPhacrxPThqdoFOszJchYu0rR5uNH8aqcix0KRaIQ12VaZALcJw4Sh5Hq t5jtMF7QJ3+SwVk1rXbZ3ZG162b/y0COH3tvhkGOt+T6eJahmqoaYuL6qOI3uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794185616; 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=ijKvB8lxW5t1mOMD2kt9DDBaCHwlKo30guhk8z8IEDQ=; b=sE9gZ4bREFSmPP6TAyw6S95b4CKtzM7f84Ld54kBaViTyaC9koJMULppTT2UdoIFEd2ltr iP63IIKuyNX9I7gX2fJAPqvR11M3Wt8QTz9B2Qi2PsLorX+NhuGLLYVCYJoFQ91enZ2qMO rGVJdQvD1JJk9fXyWO+ox4aKTv0ZbBYV4vJYjs/PmNYA+xKAO8OA35IE6FfXA0FzQoOgwc Klg2U4Z0yiU4z9Cyb367HCTGCI+UCCFmqp7MxH9hnlkafuPxaviFdj65kx+F1tL1yQl6p6 R6Q0MHX3FN7S9bJ7OJS5RQSNw8N3GNJ1SUyum8AsdvR5FZh/3S+ipUzKFz7fuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jNB9X3RbyzGHm for ; Mon, 09 Nov 2026 00:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cbf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Nov 2026 00:53:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Osvaldo Janeri Filho From: Mark Johnston Subject: git: edaa6ba7be86 - main - cryptodev: zero key material before freeing it List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: edaa6ba7be8666d4f543317845899e1a1b684bbf Auto-Submitted: auto-generated Date: Mon, 09 Nov 2026 00:53:36 +0000 Message-Id: <6af11990.1cbf.3341c6a1@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=edaa6ba7be8666d4f543317845899e1a1b684bbf commit edaa6ba7be8666d4f543317845899e1a1b684bbf Author: Osvaldo Janeri Filho AuthorDate: 2026-11-09 00:50:17 +0000 Commit: Mark Johnston CommitDate: 2026-11-09 00:50:22 +0000 cryptodev: zero key material before freeing it The /dev/crypto cipher and MAC keys are copied from userland and released with free(), leaving the key bytes in freed kernel memory. Use zfree() so the key material is cleared on session teardown and on the setup error path. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D61324 --- sys/opencrypto/cryptodev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c index 85b350ca2998..58accdc5b41b 100644 --- a/sys/opencrypto/cryptodev.c +++ b/sys/opencrypto/cryptodev.c @@ -528,8 +528,8 @@ cse_create(struct fcrypt *fcr, struct session2_op *sop) sop->crid = crypto_ses2hid(cse->cses); bail: if (error) { - free(key, M_CRYPTODEV); - free(mackey, M_CRYPTODEV); + zfree(key, M_CRYPTODEV); + zfree(mackey, M_CRYPTODEV); } return (error); } @@ -560,9 +560,9 @@ cse_free(struct csession *cse) crypto_freesession(cse->cses); mtx_destroy(&cse->lock); if (cse->key) - free(cse->key, M_CRYPTODEV); + zfree(cse->key, M_CRYPTODEV); if (cse->mackey) - free(cse->mackey, M_CRYPTODEV); + zfree(cse->mackey, M_CRYPTODEV); free(cse, M_CRYPTODEV); }