mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 06:10:56 +00:00
Code Issues Releases Wiki Activity

crypto: ccp - Remove user triggerable pr_err calls

Browse source 
Remove the pr_err calls that are issued during parameter
checking in some AES operations. This will eliminate the
possibility of filling up syslog through these paths.

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Tom Lendacky 2013-12-10 10:38:44 -06:00 committed by Herbert Xu
parent d5aa80952a
commit 369f3dabad
3 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/crypto/ccp/ccp-crypto-aes-cmac.c
View file

@ -63,10 +63,8 @@ static int ccp_do_cmac_update(struct ahash_request *req, unsigned int nbytes,
unsigned int len, need_pad, sg_count;
int ret;
if (!ctx->u.aes.key_len) {
pr_err("AES key not set\n");
if (!ctx->u.aes.key_len)
return -EINVAL;
}
if (nbytes)
rctx->null_msg = 0;

12
drivers/crypto/ccp/ccp-crypto-aes-xts.c
View file

@ -125,20 +125,14 @@ static int ccp_aes_xts_crypt(struct ablkcipher_request *req,
unsigned int unit;
int ret;
if (!ctx->u.aes.key_len) {
pr_err("AES key not set\n");
if (!ctx->u.aes.key_len)
return -EINVAL;
}
if (req->nbytes & (AES_BLOCK_SIZE - 1)) {
pr_err("AES request size is not a multiple of the block size\n");
if (req->nbytes & (AES_BLOCK_SIZE - 1))
return -EINVAL;
}
if (!req->info) {
pr_err("AES IV not supplied");
if (!req->info)
return -EINVAL;
}
for (unit = 0; unit < ARRAY_SIZE(unit_size_map); unit++)
if (!(req->nbytes & (unit_size_map[unit].size - 1)))

12
drivers/crypto/ccp/ccp-crypto-aes.c
View file

@ -76,24 +76,18 @@ static int ccp_aes_crypt(struct ablkcipher_request *req, bool encrypt)
unsigned int iv_len = 0;
int ret;
if (!ctx->u.aes.key_len) {
pr_err("AES key not set\n");
if (!ctx->u.aes.key_len)
return -EINVAL;
}
if (((ctx->u.aes.mode == CCP_AES_MODE_ECB) ||
(ctx->u.aes.mode == CCP_AES_MODE_CBC) ||
(ctx->u.aes.mode == CCP_AES_MODE_CFB)) &&
(req->nbytes & (AES_BLOCK_SIZE - 1))) {
pr_err("AES request size is not a multiple of the block size\n");
(req->nbytes & (AES_BLOCK_SIZE - 1)))
return -EINVAL;
}
if (ctx->u.aes.mode != CCP_AES_MODE_ECB) {
if (!req->info) {
pr_err("AES IV not supplied");
if (!req->info)
return -EINVAL;
}
memcpy(rctx->iv, req->info, AES_BLOCK_SIZE);
iv_sg = &rctx->iv_sg;