git: edaa6ba7be86 - main - cryptodev: zero key material before freeing it

From: Mark Johnston <markj_at_FreeBSD.org>
Date: Mon, 09 Nov 2026 00:53:36 UTC
The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=edaa6ba7be8666d4f543317845899e1a1b684bbf

commit edaa6ba7be8666d4f543317845899e1a1b684bbf
Author:     Osvaldo Janeri Filho <ojanerif@amd.com>
AuthorDate: 2026-11-09 00:50:17 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
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);
 }