mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
crypto: hisilicon/sec2 - optimize the error return process
Add the printf of an error message and optimized the handling process of ret. Signed-off-by: Chenghai Huang <huangchenghai2@huawei.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
committed by
Herbert Xu
parent
03fa301230
commit
1bed82257b
@@ -850,6 +850,7 @@ static int sec_skcipher_setkey(struct crypto_skcipher *tfm, const u8 *key,
|
||||
ret = sec_skcipher_aes_sm4_setkey(c_ctx, keylen, c_mode);
|
||||
break;
|
||||
default:
|
||||
dev_err(dev, "sec c_alg err!\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -1172,7 +1173,8 @@ static int sec_aead_setkey(struct crypto_aead *tfm, const u8 *key,
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (crypto_authenc_extractkeys(&keys, key, keylen))
|
||||
ret = crypto_authenc_extractkeys(&keys, key, keylen);
|
||||
if (ret)
|
||||
goto bad_key;
|
||||
|
||||
ret = sec_aead_aes_set_key(c_ctx, &keys);
|
||||
@@ -1189,6 +1191,7 @@ static int sec_aead_setkey(struct crypto_aead *tfm, const u8 *key,
|
||||
|
||||
if ((ctx->a_ctx.mac_len & SEC_SQE_LEN_RATE_MASK) ||
|
||||
(ctx->a_ctx.a_key_len & SEC_SQE_LEN_RATE_MASK)) {
|
||||
ret = -EINVAL;
|
||||
dev_err(dev, "MAC or AUTH key length error!\n");
|
||||
goto bad_key;
|
||||
}
|
||||
@@ -1197,7 +1200,7 @@ static int sec_aead_setkey(struct crypto_aead *tfm, const u8 *key,
|
||||
|
||||
bad_key:
|
||||
memzero_explicit(&keys, sizeof(struct crypto_authenc_keys));
|
||||
return -EINVAL;
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user