From: Thomas Huth <thuth@redhat.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
Christian Marangi <ansuelsmth@gmail.com>,
Antoine Tenart <atenart@kernel.org>
Cc: linux-crypto@vger.kernel.org, Eric Biggers <ebiggers@kernel.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH v5 10/10] crypto: eip93 - Simplify the check for a valid AES key
Date: Mon, 10 Aug 2026 11:30:05 +0200 [thread overview]
Message-ID: <20260810093009.608090-11-thuth@redhat.com> (raw)
In-Reply-To: <20260810093009.608090-1-thuth@redhat.com>
From: Thomas Huth <thuth@redhat.com>
eip93_aead_setkey() currently uses aes_expandkey() to check for a valid
AES key, but then does not use the crypto_aes_ctx afterwards anymore,
i.e. this is just a wasteful way of checking the key length, and thus
aes_check_keylen() should be used instead.
This also fixes a potential leak of sensitive data via the stack, since
this function forgot to zeroize crypto_aes_ctx before returning to the
caller.
Suggested-by: Antoine Tenart <atenart@kernel.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
drivers/crypto/inside-secure/eip93/eip93-aead.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/crypto/inside-secure/eip93/eip93-aead.c b/drivers/crypto/inside-secure/eip93/eip93-aead.c
index 2bbd0af7b0e0e..0b7a899b14d76 100644
--- a/drivers/crypto/inside-secure/eip93/eip93-aead.c
+++ b/drivers/crypto/inside-secure/eip93/eip93-aead.c
@@ -92,7 +92,6 @@ static int eip93_aead_setkey(struct crypto_aead *ctfm, const u8 *key,
struct crypto_tfm *tfm = crypto_aead_tfm(ctfm);
struct eip93_crypto_ctx *ctx = crypto_tfm_ctx(tfm);
struct crypto_authenc_keys keys;
- struct crypto_aes_ctx aes;
struct sa_record *sa_record = ctx->sa_record;
u32 nonce = 0;
int ret;
@@ -126,7 +125,7 @@ static int eip93_aead_setkey(struct crypto_aead *ctfm, const u8 *key,
break;
case EIP93_ALG_AES:
- ret = aes_expandkey(&aes, keys.enckey, keys.enckeylen);
+ ret = aes_check_keylen(keys.enckeylen);
if (ret)
return ret;
--
2.55.0
next prev parent reply other threads:[~2026-08-10 9:30 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-10 9:29 [PATCH v5 00/10] crypto: Provide a function for zeroizing crypto_aes_ctx Thomas Huth
2026-08-10 9:29 ` [PATCH v5 01/10] crypto: Provide a wrapper " Thomas Huth
2026-08-10 9:29 ` [PATCH v5 02/10] crypto: aspeed - clear the crypto_aes_ctx when done Thomas Huth
2026-08-10 9:29 ` [PATCH v5 03/10] crypto: padlock-aes " Thomas Huth
2026-08-10 9:29 ` [PATCH v5 04/10] crypto: sa2ul " Thomas Huth
2026-08-10 9:30 ` [PATCH v5 05/10] crypto: arm/aes-neonbs " Thomas Huth
2026-08-10 9:30 ` [PATCH v5 06/10] crypto: arm64/aes-neonbs " Thomas Huth
2026-08-10 9:30 ` [PATCH v5 07/10] crypto: qat - zeroize crypto_aes_ctx with __cleanup(aes_zeroize_ctx) Thomas Huth
2026-08-10 9:30 ` [PATCH v5 08/10] crypto: safexcel - Simplify the check for a valid AES key Thomas Huth
2026-08-10 14:05 ` Antoine Tenart
2026-08-10 9:30 ` [PATCH v5 09/10] crypto: safexcel - zeroize crypto_aes_ctx with __cleanup(aes_zeroize_ctx) Thomas Huth
2026-08-10 9:30 ` Thomas Huth [this message]
2026-08-10 14:14 ` [PATCH v5 10/10] crypto: eip93 - Simplify the check for a valid AES key Antoine Tenart
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=20260810093009.608090-11-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=ansuelsmth@gmail.com \
--cc=atenart@kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.