]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
crypto: caam - don't leak pointers to authenc keys
authorTudor-Dan Ambarus <tudor.ambarus@microchip.com>
Fri, 23 Mar 2018 10:42:18 +0000 (12:42 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 30 Mar 2018 17:33:11 +0000 (01:33 +0800)
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>
drivers/crypto/caam/caamalg.c

index 584a6c183548267e41939e533f4f5367f782f8c3..7207a535942dcb88ced37cc04287d767248dc4be 100644 (file)
@@ -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;
 }