diff options
| author | Tom Lendacky <thomas.lendacky@amd.com> | 2013-12-10 10:38:44 -0600 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-12-20 20:06:22 +0800 |
| commit | 369f3dabad95aaa3b04ec390d5489d9d46e51395 (patch) | |
| tree | 494d90d88310fe987d9ae659f4697962557a3525 /drivers/crypto | |
| parent | d5aa80952aba9071b50a74c8daf7feb1caa2fd8c (diff) | |
| download | linux-369f3dabad95aaa3b04ec390d5489d9d46e51395.tar.gz linux-369f3dabad95aaa3b04ec390d5489d9d46e51395.tar.bz2 linux-369f3dabad95aaa3b04ec390d5489d9d46e51395.zip | |
crypto: ccp - Remove user triggerable pr_err calls
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>
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 4 | ||||
| -rw-r--r-- | drivers/crypto/ccp/ccp-crypto-aes-xts.c | 12 | ||||
| -rw-r--r-- | drivers/crypto/ccp/ccp-crypto-aes.c | 12 |
3 files changed, 7 insertions, 21 deletions
diff --git a/drivers/crypto/ccp/ccp-crypto-aes-cmac.c b/drivers/crypto/ccp/ccp-crypto-aes-cmac.c index 5b9cd982339d..64dd35e291b0 100644 --- a/drivers/crypto/ccp/ccp-crypto-aes-cmac.c +++ b/drivers/crypto/ccp/ccp-crypto-aes-cmac.c @@ -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; diff --git a/drivers/crypto/ccp/ccp-crypto-aes-xts.c b/drivers/crypto/ccp/ccp-crypto-aes-xts.c index d100b48415b6..0237ab58f242 100644 --- a/drivers/crypto/ccp/ccp-crypto-aes-xts.c +++ b/drivers/crypto/ccp/ccp-crypto-aes-xts.c @@ -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))) diff --git a/drivers/crypto/ccp/ccp-crypto-aes.c b/drivers/crypto/ccp/ccp-crypto-aes.c index c0befdb2240b..e46490db0f63 100644 --- a/drivers/crypto/ccp/ccp-crypto-aes.c +++ b/drivers/crypto/ccp/ccp-crypto-aes.c @@ -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; |