summaryrefslogtreecommitdiffstats
path: root/drivers/crypto/caam
diff options
context:
space:
mode:
authorTudor-Dan Ambarus <tudor.ambarus@microchip.com>2018-03-23 12:42:18 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2018-03-31 01:33:11 +0800
commit61dab9726050b0ffa826f1b540e9518768914b76 (patch)
tree8c006bf62746e61fe9c5c3ea12db5f2cdd1aa1de /drivers/crypto/caam
parent8c9bdab21289c211ca1ca6a5f9b7537b4a600a02 (diff)
downloadlinux-61dab9726050b0ffa826f1b540e9518768914b76.tar.gz
linux-61dab9726050b0ffa826f1b540e9518768914b76.tar.bz2
linux-61dab9726050b0ffa826f1b540e9518768914b76.zip
crypto: caam - don't leak pointers to authenc keys
In caam's aead_setkey we save pointers to the authenc keys in a local variable of type struct crypto_authenc_keys and we don't zeroize it after use. Fix this and don't leak pointers to the authenc keys. Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> Reviewed-by: Horia Geantă <horia.geanta@nxp.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/caam')
-rw-r--r--drivers/crypto/caam/caamalg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 584a6c183548..7207a535942d 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -570,9 +570,11 @@ static int aead_setkey(struct crypto_aead *aead,
skip_split_key:
ctx->cdata.keylen = keys.enckeylen;
+ memzero_explicit(&keys, sizeof(keys));
return aead_set_sh_desc(aead);
badkey:
crypto_aead_set_flags(aead, CRYPTO_TFM_RES_BAD_KEY_LEN);
+ memzero_explicit(&keys, sizeof(keys));
return -EINVAL;
}