diff options
| author | Hailey Mothershead <hailmo@amazon.com> | 2024-04-15 22:19:15 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-07-11 12:47:05 +0200 |
| commit | 28c8d274848feba552e95c5c2a7e3cfe8f15c534 (patch) | |
| tree | 8fe599f13a6d5000922681fa3266f8b5fbeec324 /crypto | |
| parent | fa49c65a1cec6a3901ef884fdb24d98068b63493 (diff) | |
| download | linux-28c8d274848feba552e95c5c2a7e3cfe8f15c534.tar.gz linux-28c8d274848feba552e95c5c2a7e3cfe8f15c534.tar.bz2 linux-28c8d274848feba552e95c5c2a7e3cfe8f15c534.zip | |
crypto: aead,cipher - zeroize key buffer after use
[ 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>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/aead.c | 3 | ||||
| -rw-r--r-- | crypto/cipher.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/crypto/aead.c b/crypto/aead.c index 16991095270d..c4ece86c45bc 100644 --- a/crypto/aead.c +++ b/crypto/aead.c @@ -35,8 +35,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 b47141ed4a9f..395f0c2fbb9f 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; } |