]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
crypto: picoxcell - don't leak pointers to authenc keys
authorTudor-Dan Ambarus <tudor.ambarus@microchip.com>
Fri, 23 Mar 2018 10:42:22 +0000 (12:42 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 30 Mar 2018 17:33:13 +0000 (01:33 +0800)
In spacc_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: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/picoxcell_crypto.c

index 4ef52c9d72fc2ab2a340db8b9cb718f95d93737e..a4df966adbf621984064a719f79a5375b7ba25cc 100644 (file)
@@ -499,10 +499,12 @@ static int spacc_aead_setkey(struct crypto_aead *tfm, const u8 *key,
        memcpy(ctx->hash_ctx, keys.authkey, keys.authkeylen);
        ctx->hash_key_len = keys.authkeylen;
 
+       memzero_explicit(&keys, sizeof(keys));
        return 0;
 
 badkey:
        crypto_aead_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
+       memzero_explicit(&keys, sizeof(keys));
        return -EINVAL;
 }