From: Thomas Huth <thuth@redhat.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org
Cc: Eric Biggers <ebiggers@kernel.org>
Subject: [PATCH v3 01/10] crypto: Provide a wrapper function for zeroizing crypto_aes_ctx
Date: Wed, 5 Aug 2026 13:57:39 +0200 [thread overview]
Message-ID: <20260805115749.392672-2-thuth@redhat.com> (raw)
In-Reply-To: <20260805115749.392672-1-thuth@redhat.com>
From: Thomas Huth <thuth@redhat.com>
Several crypto drivers need to zeroize their local crypto_aes_ctx
structures after use to avoid leaking key material on the stack.
Currently some call sites do this with their own memzero_explicit()
call, which is error-prone since it is easy to miss a return path
(what already happened in a driver). Some other call sites miss
to clear crypto_aes_ctx completely.
Provide an aes_zeroize_ctx() helper that can be used with __cleanup()
to automatically zeroize the context when it goes out of scope.
Acked-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
include/crypto/aes.h | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/include/crypto/aes.h b/include/crypto/aes.h
index 3279cfa546085..eb970b8d623f9 100644
--- a/include/crypto/aes.h
+++ b/include/crypto/aes.h
@@ -159,6 +159,19 @@ static inline int aes_check_keylen(size_t keylen)
int aes_expandkey(struct crypto_aes_ctx *ctx, const u8 *in_key,
unsigned int key_len);
+/**
+ * aes_zeroize_ctx - Clear a crypto_aes_ctx structure
+ * @ctx: The location of the context that should be zeroized
+ *
+ * Explicitly fills the crypto_aes_ctx with zeroes. This should be done
+ * once the context is not required anymore to avoid that its contents
+ * are leaked on the stack or heap.
+ */
+static inline void aes_zeroize_ctx(struct crypto_aes_ctx *ctx)
+{
+ memzero_explicit(ctx, sizeof(*ctx));
+}
+
/*
* The following functions are temporarily exported for use by the AES mode
* implementations in arch/$(SRCARCH)/crypto/. These exports will go away when
--
2.55.0
next prev parent reply other threads:[~2026-08-05 11:58 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-05 11:57 [PATCH v3 00/10] crypto: Provide a function for zeroizing crypto_aes_ctx Thomas Huth
2026-08-05 11:57 ` Thomas Huth [this message]
2026-08-05 11:57 ` [PATCH v3 02/10] crypto: aspeed - clear the crypto_aes_ctx when done Thomas Huth
2026-08-05 11:57 ` [PATCH v3 03/10] crypto: inside-secure/eip93 " Thomas Huth
2026-08-05 11:57 ` [PATCH v3 04/10] crypto: padlock-aes " Thomas Huth
2026-08-05 11:57 ` [PATCH v3 05/10] crypto: sa2ul " Thomas Huth
2026-08-05 11:57 ` [PATCH v3 06/10] crypto: arm/aes-neonbs " Thomas Huth
2026-08-05 11:57 ` [PATCH v3 07/10] crypto: arm64/aes-neonbs " Thomas Huth
2026-08-05 11:57 ` [PATCH v3 08/10] crypto: qat - zeroize crypto_aes_ctx with __cleanup(aes_zeroize_ctx) Thomas Huth
2026-08-05 11:57 ` [PATCH v3 09/10] crypto: safexcel - Rework cleanup of sensitive structs in safexcel_aead_setkey Thomas Huth
2026-08-06 8:10 ` Antoine Tenart
2026-08-06 8:18 ` Thomas Huth
2026-08-06 12:37 ` Antoine Tenart
2026-08-05 11:57 ` [PATCH v3 10/10] crypto: safexcel - zeroize crypto_aes_ctx with __cleanup(aes_zeroize_ctx) Thomas Huth
2026-08-06 8:17 ` Antoine Tenart
2026-08-05 20:22 ` [PATCH v3 00/10] crypto: Provide a function for zeroizing crypto_aes_ctx Eric Biggers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260805115749.392672-2-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=davem@davemloft.net \
--cc=ebiggers@kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).