| From a8bc4f5e7a72e4067f5afd7e98b61624231713ca Mon Sep 17 00:00:00 2001 |
| From: Wei Yongjun <weiyongjun1@huawei.com> |
| Date: Wed, 2 Jun 2021 11:36:45 +0000 |
| Subject: crypto: qce - fix error return code in qce_skcipher_async_req_handle() |
| |
| From: Wei Yongjun <weiyongjun1@huawei.com> |
| |
| commit a8bc4f5e7a72e4067f5afd7e98b61624231713ca upstream. |
| |
| Fix to return a negative error code from the error handling |
| case instead of 0, as done elsewhere in this function. |
| |
| Fixes: 1339a7c3ba05 ("crypto: qce: skcipher: Fix incorrect sg count for dma transfers") |
| Reported-by: Hulk Robot <hulkci@huawei.com> |
| Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> |
| Reviewed-by: Thara Gopinath <thara.gopinath@linaro.org> |
| Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/crypto/qce/skcipher.c | 8 ++++++-- |
| 1 file changed, 6 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/crypto/qce/skcipher.c |
| +++ b/drivers/crypto/qce/skcipher.c |
| @@ -123,13 +123,17 @@ qce_skcipher_async_req_handle(struct cry |
| rctx->dst_sg = rctx->dst_tbl.sgl; |
| |
| dst_nents = dma_map_sg(qce->dev, rctx->dst_sg, rctx->dst_nents, dir_dst); |
| - if (dst_nents < 0) |
| + if (dst_nents < 0) { |
| + ret = dst_nents; |
| goto error_free; |
| + } |
| |
| if (diff_dst) { |
| src_nents = dma_map_sg(qce->dev, req->src, rctx->src_nents, dir_src); |
| - if (src_nents < 0) |
| + if (src_nents < 0) { |
| + ret = src_nents; |
| goto error_unmap_dst; |
| + } |
| rctx->src_sg = req->src; |
| } else { |
| rctx->src_sg = rctx->dst_sg; |
