Skip to content

L
linux
Commit 5fe8c711 authored by Harsh Jain's avatar Harsh Jain Committed by Herbert Xu
Browse files
Options

crypto: chcr - Return correct error code 

Return correct error instead of EINVAL.
Signed-off-by: default avatarHarsh Jain <harsh@chelsio.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 4dbeae42
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 34 deletions
drivers/crypto/chelsio/chcr_algo.c
View file @ 5fe8c711
...@@ -1399,7 +1399,7 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req, ...@@ -1399,7 +1399,7 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req,
unsigned short stop_offset = 0; unsigned short stop_offset = 0;
unsigned int assoclen = req->assoclen; unsigned int assoclen = req->assoclen;
unsigned int authsize = crypto_aead_authsize(tfm); unsigned int authsize = crypto_aead_authsize(tfm);
int err = -EINVAL, src_nent; int error = -EINVAL, src_nent;
int null = 0; int null = 0;
gfp_t flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL : gfp_t flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :
GFP_ATOMIC; GFP_ATOMIC;
...@@ -1416,9 +1416,9 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req, ...@@ -1416,9 +1416,9 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req,
reqctx->dst = src; reqctx->dst = src;
if (req->src != req->dst) { if (req->src != req->dst) {
err = chcr_copy_assoc(req, aeadctx); error = chcr_copy_assoc(req, aeadctx);
if (err) if (error)
return ERR_PTR(err); return ERR_PTR(error);
reqctx->dst = scatterwalk_ffwd(reqctx->dstffwd, req->dst, reqctx->dst = scatterwalk_ffwd(reqctx->dstffwd, req->dst,
req->assoclen); req->assoclen);
} }
...@@ -1430,6 +1430,7 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req, ...@@ -1430,6 +1430,7 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req,
(op_type ? -authsize : authsize)); (op_type ? -authsize : authsize));
if (reqctx->dst_nents < 0) { if (reqctx->dst_nents < 0) {
pr_err("AUTHENC:Invalid Destination sg entries\n"); pr_err("AUTHENC:Invalid Destination sg entries\n");
error = -EINVAL;
goto err; goto err;
} }
dst_size = get_space_for_phys_dsgl(reqctx->dst_nents); dst_size = get_space_for_phys_dsgl(reqctx->dst_nents);
...@@ -1443,8 +1444,10 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req, ...@@ -1443,8 +1444,10 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req,
return ERR_PTR(chcr_aead_fallback(req, op_type)); return ERR_PTR(chcr_aead_fallback(req, op_type));
} }
skb = alloc_skb((transhdr_len + sizeof(struct sge_opaque_hdr)), flags); skb = alloc_skb((transhdr_len + sizeof(struct sge_opaque_hdr)), flags);
if (!skb) if (!skb) {
error = -ENOMEM;
goto err; goto err;
}
/* LLD is going to write the sge hdr. */ /* LLD is going to write the sge hdr. */
skb_reserve(skb, sizeof(struct sge_opaque_hdr)); skb_reserve(skb, sizeof(struct sge_opaque_hdr));
...@@ -1496,9 +1499,9 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req, ...@@ -1496,9 +1499,9 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req,
sg_param.nents = reqctx->dst_nents; sg_param.nents = reqctx->dst_nents;
sg_param.obsize = req->cryptlen + (op_type ? -authsize : authsize); sg_param.obsize = req->cryptlen + (op_type ? -authsize : authsize);
sg_param.qid = qid; sg_param.qid = qid;
sg_param.align = 0; error = map_writesg_phys_cpl(&u_ctx->lldi.pdev->dev, phys_cpl,
if (map_writesg_phys_cpl(&u_ctx->lldi.pdev->dev, phys_cpl, reqctx->dst, reqctx->dst, &sg_param);
&sg_param)) if (error)
goto dstmap_fail; goto dstmap_fail;
skb_set_transport_header(skb, transhdr_len); skb_set_transport_header(skb, transhdr_len);
...@@ -1520,7 +1523,7 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req, ...@@ -1520,7 +1523,7 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req,
/* ivmap_fail: */ /* ivmap_fail: */
kfree_skb(skb); kfree_skb(skb);
err: err:
return ERR_PTR(-EINVAL); return ERR_PTR(error);
} }
static int set_msg_len(u8 *block, unsigned int msglen, int csize) static int set_msg_len(u8 *block, unsigned int msglen, int csize)
...@@ -1730,7 +1733,7 @@ static struct sk_buff *create_aead_ccm_wr(struct aead_request *req, ...@@ -1730,7 +1733,7 @@ static struct sk_buff *create_aead_ccm_wr(struct aead_request *req,
unsigned int dst_size = 0, kctx_len; unsigned int dst_size = 0, kctx_len;
unsigned int sub_type; unsigned int sub_type;
unsigned int authsize = crypto_aead_authsize(tfm); unsigned int authsize = crypto_aead_authsize(tfm);
int err = -EINVAL, src_nent; int error = -EINVAL, src_nent;
gfp_t flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL : gfp_t flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :
GFP_ATOMIC; GFP_ATOMIC;
...@@ -1746,10 +1749,10 @@ static struct sk_buff *create_aead_ccm_wr(struct aead_request *req, ...@@ -1746,10 +1749,10 @@ static struct sk_buff *create_aead_ccm_wr(struct aead_request *req,
reqctx->dst = src; reqctx->dst = src;
if (req->src != req->dst) { if (req->src != req->dst) {
err = chcr_copy_assoc(req, aeadctx); error = chcr_copy_assoc(req, aeadctx);
if (err) { if (error) {
pr_err("AAD copy to destination buffer fails\n"); pr_err("AAD copy to destination buffer fails\n");
return ERR_PTR(err); return ERR_PTR(error);
} }
reqctx->dst = scatterwalk_ffwd(reqctx->dstffwd, req->dst, reqctx->dst = scatterwalk_ffwd(reqctx->dstffwd, req->dst,
req->assoclen); req->assoclen);
...@@ -1758,11 +1761,11 @@ static struct sk_buff *create_aead_ccm_wr(struct aead_request *req, ...@@ -1758,11 +1761,11 @@ static struct sk_buff *create_aead_ccm_wr(struct aead_request *req,
(op_type ? -authsize : authsize)); (op_type ? -authsize : authsize));
if (reqctx->dst_nents < 0) { if (reqctx->dst_nents < 0) {
pr_err("CCM:Invalid Destination sg entries\n"); pr_err("CCM:Invalid Destination sg entries\n");
error = -EINVAL;
goto err; goto err;
} }
error = aead_ccm_validate_input(op_type, req, aeadctx, sub_type);
if (error)
if (aead_ccm_validate_input(op_type, req, aeadctx, sub_type))
goto err; goto err;
dst_size = get_space_for_phys_dsgl(reqctx->dst_nents); dst_size = get_space_for_phys_dsgl(reqctx->dst_nents);
...@@ -1777,8 +1780,10 @@ static struct sk_buff *create_aead_ccm_wr(struct aead_request *req, ...@@ -1777,8 +1780,10 @@ static struct sk_buff *create_aead_ccm_wr(struct aead_request *req,
skb = alloc_skb((transhdr_len + sizeof(struct sge_opaque_hdr)), flags); skb = alloc_skb((transhdr_len + sizeof(struct sge_opaque_hdr)), flags);
if (!skb) if (!skb) {
error = -ENOMEM;
goto err; goto err;
}
skb_reserve(skb, sizeof(struct sge_opaque_hdr)); skb_reserve(skb, sizeof(struct sge_opaque_hdr));
...@@ -1793,15 +1798,16 @@ static struct sk_buff *create_aead_ccm_wr(struct aead_request *req, ...@@ -1793,15 +1798,16 @@ static struct sk_buff *create_aead_ccm_wr(struct aead_request *req,
16), aeadctx->key, aeadctx->enckey_len); 16), aeadctx->key, aeadctx->enckey_len);
phys_cpl = (struct cpl_rx_phys_dsgl *)((u8 *)(chcr_req + 1) + kctx_len); phys_cpl = (struct cpl_rx_phys_dsgl *)((u8 *)(chcr_req + 1) + kctx_len);
if (ccm_format_packet(req, aeadctx, sub_type, op_type)) error = ccm_format_packet(req, aeadctx, sub_type, op_type);
if (error)
goto dstmap_fail; goto dstmap_fail;
sg_param.nents = reqctx->dst_nents; sg_param.nents = reqctx->dst_nents;
sg_param.obsize = req->cryptlen + (op_type ? -authsize : authsize); sg_param.obsize = req->cryptlen + (op_type ? -authsize : authsize);
sg_param.qid = qid; sg_param.qid = qid;
sg_param.align = 0; error = map_writesg_phys_cpl(&u_ctx->lldi.pdev->dev, phys_cpl,
if (map_writesg_phys_cpl(&u_ctx->lldi.pdev->dev, phys_cpl, reqctx->dst, reqctx->dst, &sg_param);
&sg_param)) if (error)
goto dstmap_fail; goto dstmap_fail;
skb_set_transport_header(skb, transhdr_len); skb_set_transport_header(skb, transhdr_len);
...@@ -1813,9 +1819,8 @@ static struct sk_buff *create_aead_ccm_wr(struct aead_request *req, ...@@ -1813,9 +1819,8 @@ static struct sk_buff *create_aead_ccm_wr(struct aead_request *req,
return skb; return skb;
dstmap_fail: dstmap_fail:
kfree_skb(skb); kfree_skb(skb);
skb = NULL;
err: err:
return ERR_PTR(-EINVAL); return ERR_PTR(error);
} }
static struct sk_buff *create_gcm_wr(struct aead_request *req, static struct sk_buff *create_gcm_wr(struct aead_request *req,
...@@ -1839,7 +1844,7 @@ static struct sk_buff *create_gcm_wr(struct aead_request *req, ...@@ -1839,7 +1844,7 @@ static struct sk_buff *create_gcm_wr(struct aead_request *req,
unsigned char tag_offset = 0; unsigned char tag_offset = 0;
unsigned int crypt_len = 0; unsigned int crypt_len = 0;
unsigned int authsize = crypto_aead_authsize(tfm); unsigned int authsize = crypto_aead_authsize(tfm);
int err = -EINVAL, src_nent; int error = -EINVAL, src_nent;
gfp_t flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL : gfp_t flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :
GFP_ATOMIC; GFP_ATOMIC;
...@@ -1856,9 +1861,9 @@ static struct sk_buff *create_gcm_wr(struct aead_request *req, ...@@ -1856,9 +1861,9 @@ static struct sk_buff *create_gcm_wr(struct aead_request *req,
src = scatterwalk_ffwd(reqctx->srcffwd, req->src, req->assoclen); src = scatterwalk_ffwd(reqctx->srcffwd, req->src, req->assoclen);
reqctx->dst = src; reqctx->dst = src;
if (req->src != req->dst) { if (req->src != req->dst) {
err = chcr_copy_assoc(req, aeadctx); error = chcr_copy_assoc(req, aeadctx);
if (err) if (error)
return ERR_PTR(err); return ERR_PTR(error);
reqctx->dst = scatterwalk_ffwd(reqctx->dstffwd, req->dst, reqctx->dst = scatterwalk_ffwd(reqctx->dstffwd, req->dst,
req->assoclen); req->assoclen);
} }
...@@ -1874,6 +1879,7 @@ static struct sk_buff *create_gcm_wr(struct aead_request *req, ...@@ -1874,6 +1879,7 @@ static struct sk_buff *create_gcm_wr(struct aead_request *req,
(op_type ? -authsize : authsize)); (op_type ? -authsize : authsize));
if (reqctx->dst_nents < 0) { if (reqctx->dst_nents < 0) {
pr_err("GCM:Invalid Destination sg entries\n"); pr_err("GCM:Invalid Destination sg entries\n");
error = -EINVAL;
goto err; goto err;
} }
...@@ -1889,8 +1895,10 @@ static struct sk_buff *create_gcm_wr(struct aead_request *req, ...@@ -1889,8 +1895,10 @@ static struct sk_buff *create_gcm_wr(struct aead_request *req,
return ERR_PTR(chcr_aead_fallback(req, op_type)); return ERR_PTR(chcr_aead_fallback(req, op_type));
} }
skb = alloc_skb((transhdr_len + sizeof(struct sge_opaque_hdr)), flags); skb = alloc_skb((transhdr_len + sizeof(struct sge_opaque_hdr)), flags);
if (!skb) if (!skb) {
error = -ENOMEM;
goto err; goto err;
}
/* NIC driver is going to write the sge hdr. */ /* NIC driver is going to write the sge hdr. */
skb_reserve(skb, sizeof(struct sge_opaque_hdr)); skb_reserve(skb, sizeof(struct sge_opaque_hdr));
...@@ -1941,9 +1949,9 @@ static struct sk_buff *create_gcm_wr(struct aead_request *req, ...@@ -1941,9 +1949,9 @@ static struct sk_buff *create_gcm_wr(struct aead_request *req,
sg_param.nents = reqctx->dst_nents; sg_param.nents = reqctx->dst_nents;
sg_param.obsize = req->cryptlen + (op_type ? -authsize : authsize); sg_param.obsize = req->cryptlen + (op_type ? -authsize : authsize);
sg_param.qid = qid; sg_param.qid = qid;
sg_param.align = 0; error = map_writesg_phys_cpl(&u_ctx->lldi.pdev->dev, phys_cpl,
if (map_writesg_phys_cpl(&u_ctx->lldi.pdev->dev, phys_cpl, reqctx->dst, reqctx->dst, &sg_param);
&sg_param)) if (error)
goto dstmap_fail; goto dstmap_fail;
skb_set_transport_header(skb, transhdr_len); skb_set_transport_header(skb, transhdr_len);
...@@ -1962,9 +1970,8 @@ static struct sk_buff *create_gcm_wr(struct aead_request *req, ...@@ -1962,9 +1970,8 @@ static struct sk_buff *create_gcm_wr(struct aead_request *req,
dstmap_fail: dstmap_fail:
/* ivmap_fail: */ /* ivmap_fail: */
kfree_skb(skb); kfree_skb(skb);
skb = NULL;
err: err:
return skb; return ERR_PTR(error);
} }
...@@ -1976,7 +1983,8 @@ static int chcr_aead_cra_init(struct crypto_aead *tfm) ...@@ -1976,7 +1983,8 @@ static int chcr_aead_cra_init(struct crypto_aead *tfm)
struct aead_alg *alg = crypto_aead_alg(tfm); struct aead_alg *alg = crypto_aead_alg(tfm);
aeadctx->sw_cipher = crypto_alloc_aead(alg->base.cra_name, 0, aeadctx->sw_cipher = crypto_alloc_aead(alg->base.cra_name, 0,
CRYPTO_ALG_NEED_FALLBACK); CRYPTO_ALG_NEED_FALLBACK |
CRYPTO_ALG_ASYNC);
if (IS_ERR(aeadctx->sw_cipher)) if (IS_ERR(aeadctx->sw_cipher))
return PTR_ERR(aeadctx->sw_cipher); return PTR_ERR(aeadctx->sw_cipher);
crypto_aead_set_reqsize(tfm, max(sizeof(struct chcr_aead_reqctx), crypto_aead_set_reqsize(tfm, max(sizeof(struct chcr_aead_reqctx),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7