iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: chelsio - don't leak pointers to authenc keys

Browse Source 
In chcr_authenc_setkey and chcr_aead_digest_null_setkey we save
pointers to the authenc keys in local variables of type
struct crypto_authenc_keys and we don't zeroize them 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>
This commit is contained in:
Tudor-Dan Ambarus 2018-03-23 12:42:20 +02:00 committed by Herbert Xu
parent cc4ccaafcb
commit eb52653175
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/crypto/chelsio/chcr_algo.c
View File

@ -3456,6 +3456,7 @@ static int chcr_authenc_setkey(struct crypto_aead *authenc, const u8 *key,
if (IS_ERR(base_hash)) { if (IS_ERR(base_hash)) {
pr_err("chcr : Base driver cannot be loaded\n"); pr_err("chcr : Base driver cannot be loaded\n");
aeadctx->enckey_len = 0; aeadctx->enckey_len = 0;
memzero_explicit(&keys, sizeof(keys));
return -EINVAL; return -EINVAL;
} }
{ {
@ -3507,10 +3508,12 @@ static int chcr_authenc_setkey(struct crypto_aead *authenc, const u8 *key,
actx->auth_mode = param.auth_mode; actx->auth_mode = param.auth_mode;
chcr_free_shash(base_hash); chcr_free_shash(base_hash);
memzero_explicit(&keys, sizeof(keys));
return 0; return 0;
} }
out: out:
aeadctx->enckey_len = 0; aeadctx->enckey_len = 0;
memzero_explicit(&keys, sizeof(keys));
if (!IS_ERR(base_hash)) if (!IS_ERR(base_hash))
chcr_free_shash(base_hash); chcr_free_shash(base_hash);
return -EINVAL; return -EINVAL;
@ -3573,9 +3576,11 @@ static int chcr_aead_digest_null_setkey(struct crypto_aead *authenc,
aeadctx->key_ctx_hdr = FILL_KEY_CTX_HDR(ck_size, CHCR_KEYCTX_NO_KEY, 0, aeadctx->key_ctx_hdr = FILL_KEY_CTX_HDR(ck_size, CHCR_KEYCTX_NO_KEY, 0,
0, key_ctx_len >> 4); 0, key_ctx_len >> 4);
actx->auth_mode = CHCR_SCMD_AUTH_MODE_NOP; actx->auth_mode = CHCR_SCMD_AUTH_MODE_NOP;
memzero_explicit(&keys, sizeof(keys));
return 0; return 0;
out: out:
aeadctx->enckey_len = 0; aeadctx->enckey_len = 0;
memzero_explicit(&keys, sizeof(keys));
return -EINVAL; return -EINVAL;
} }