| From b38c94e6447459928db74a989aad99cbb1109798 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 15 Apr 2024 22:19:15 +0000 |
| Subject: crypto: aead,cipher - zeroize key buffer after use |
| |
| From: Hailey Mothershead <hailmo@amazon.com> |
| |
| [ Upstream commit 23e4099bdc3c8381992f9eb975c79196d6755210 ] |
| |
| I.G 9.7.B for FIPS 140-3 specifies that variables temporarily holding |
| cryptographic information should be zeroized once they are no longer |
| needed. Accomplish this by using kfree_sensitive for buffers that |
| previously held the private key. |
| |
| Signed-off-by: Hailey Mothershead <hailmo@amazon.com> |
| Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| crypto/aead.c | 3 +-- |
| crypto/cipher.c | 3 +-- |
| 2 files changed, 2 insertions(+), 4 deletions(-) |
| |
| diff --git a/crypto/aead.c b/crypto/aead.c |
| index d5ba204ebdbfa..ecab683016b7d 100644 |
| --- a/crypto/aead.c |
| +++ b/crypto/aead.c |
| @@ -45,8 +45,7 @@ static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key, |
| alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); |
| memcpy(alignbuffer, key, keylen); |
| ret = crypto_aead_alg(tfm)->setkey(tfm, alignbuffer, keylen); |
| - memset(alignbuffer, 0, keylen); |
| - kfree(buffer); |
| + kfree_sensitive(buffer); |
| return ret; |
| } |
| |
| diff --git a/crypto/cipher.c b/crypto/cipher.c |
| index 47c77a3e59783..40cae908788ec 100644 |
| --- a/crypto/cipher.c |
| +++ b/crypto/cipher.c |
| @@ -34,8 +34,7 @@ static int setkey_unaligned(struct crypto_cipher *tfm, const u8 *key, |
| alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); |
| memcpy(alignbuffer, key, keylen); |
| ret = cia->cia_setkey(crypto_cipher_tfm(tfm), alignbuffer, keylen); |
| - memset(alignbuffer, 0, keylen); |
| - kfree(buffer); |
| + kfree_sensitive(buffer); |
| return ret; |
| |
| } |
| -- |
| 2.43.0 |
| |
