crypto: arm/neon - memzero_explicit aes-cbc key

At function exit, do not leave the expanded key in the rk struct
which got allocated on the stack.

Signed-off-by: Torsten Duwe <duwe@suse.de>
Acked-by: Will Deacon <will@kernel.org>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/arm/crypto/aes-neonbs-glue.c b/arch/arm/crypto/aes-neonbs-glue.c
index e85839a8aaeb8b35d6f4f5e0ac804da1f7543c9d..e6fd32919c81e0dea48d3200f999fcc29375a802 100644 (file)
--- a/arch/arm/crypto/aes-neonbs-glue.c
+++ b/arch/arm/crypto/aes-neonbs-glue.c
@@ -138,6 +138,7 @@ static int aesbs_cbc_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
        kernel_neon_begin();
        aesbs_convert_key(ctx->key.rk, rk.key_enc, ctx->key.rounds);
        kernel_neon_end();
+       memzero_explicit(&rk, sizeof(rk));
 
        return crypto_cipher_setkey(ctx->enc_tfm, in_key, key_len);
 }

diff --git a/arch/arm64/crypto/aes-neonbs-glue.c b/arch/arm64/crypto/aes-neonbs-glue.c
index e3e27349a9fe5cd0784b8ad653fbec3cdb453aa7..fb507d56992292bd7ce2eac116063b932527dbe9 100644 (file)
--- a/arch/arm64/crypto/aes-neonbs-glue.c
+++ b/arch/arm64/crypto/aes-neonbs-glue.c
@@ -151,6 +151,7 @@ static int aesbs_cbc_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
        kernel_neon_begin();
        aesbs_convert_key(ctx->key.rk, rk.key_enc, ctx->key.rounds);
        kernel_neon_end();
+       memzero_explicit(&rk, sizeof(rk));
 
        return 0;
 }