2021-06-02 11:28:18

by Wei Yongjun

Subject: [PATCH -next] crypto: qce: skcipher: fix error return code in qce_skcipher_async_req_handle()

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 <[email protected]>
Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/crypto/qce/skcipher.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/qce/skcipher.c b/drivers/crypto/qce/skcipher.c
index 259418479227..8ff10928f581 100644
--- a/drivers/crypto/qce/skcipher.c
+++ b/drivers/crypto/qce/skcipher.c
@@ -124,13 +124,17 @@ qce_skcipher_async_req_handle(struct crypto_async_request *async_req)
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;

2021-06-08 22:48:20

by Thara Gopinath

Subject: Re: [PATCH -next] crypto: qce: skcipher: fix error return code in qce_skcipher_async_req_handle()

On 6/2/21 7:36 AM, Wei Yongjun wrote:
> 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 <[email protected]>
> Signed-off-by: Wei Yongjun <[email protected]>

Reviewed-by: Thara Gopinath <[email protected]>

--
Warm Regards
Thara

> ---
> drivers/crypto/qce/skcipher.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/crypto/qce/skcipher.c b/drivers/crypto/qce/skcipher.c
> index 259418479227..8ff10928f581 100644
> --- a/drivers/crypto/qce/skcipher.c
> +++ b/drivers/crypto/qce/skcipher.c
> @@ -124,13 +124,17 @@ qce_skcipher_async_req_handle(struct crypto_async_request *async_req)
> 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;
>

2021-06-11 07:24:52

by Herbert Xu

Subject: Re: [PATCH -next] crypto: qce: skcipher: fix error return code in qce_skcipher_async_req_handle()

On Wed, Jun 02, 2021 at 11:36:45AM +0000, Wei Yongjun wrote:
> 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 <[email protected]>
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> drivers/crypto/qce/skcipher.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)

Patch applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt