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

index 717a26607bdbbaf0143c969805f82bdb8bb8ffa8..27f7dad2d45d9d92b3eae73525b0aaae73cd4523 100644 (file)
@@ -1167,9 +1167,11 @@ static int aead_setkey(struct crypto_aead *tfm, const u8 *key,
        ctx->authkey_len = keys.authkeylen;
        ctx->enckey_len = keys.enckeylen;
 
+       memzero_explicit(&keys, sizeof(keys));
        return aead_setup(tfm, crypto_aead_authsize(tfm));
 badkey:
        crypto_aead_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
+       memzero_explicit(&keys, sizeof(keys));
        return -EINVAL;
 }