crypto: qce - Fix dma_map_sg error check
authorJack Wang <jinpu.wang@ionos.com>
Fri, 19 Aug 2022 06:07:51 +0000 (08:07 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 26 Aug 2022 10:50:39 +0000 (18:50 +0800)
dma_map_sg return 0 on error, fix the error check and return -EIO to
caller.

Cc: Thara Gopinath <thara.gopinath@gmail.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org
Cc: linux-arm-msm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/qce/aead.c
drivers/crypto/qce/sha.c
drivers/crypto/qce/skcipher.c

index 97a5301..6eb4d2e 100644 (file)
@@ -450,8 +450,8 @@ qce_aead_async_req_handle(struct crypto_async_request *async_req)
        if (ret)
                return ret;
        dst_nents = dma_map_sg(qce->dev, rctx->dst_sg, rctx->dst_nents, dir_dst);
-       if (dst_nents < 0) {
-               ret = dst_nents;
+       if (!dst_nents) {
+               ret = -EIO;
                goto error_free;
        }
 
index 59159f5..37bafd7 100644 (file)
@@ -97,14 +97,16 @@ static int qce_ahash_async_req_handle(struct crypto_async_request *async_req)
        }
 
        ret = dma_map_sg(qce->dev, req->src, rctx->src_nents, DMA_TO_DEVICE);
-       if (ret < 0)
-               return ret;
+       if (!ret)
+               return -EIO;
 
        sg_init_one(&rctx->result_sg, qce->dma.result_buf, QCE_RESULT_BUF_SZ);
 
        ret = dma_map_sg(qce->dev, &rctx->result_sg, 1, DMA_FROM_DEVICE);
-       if (ret < 0)
+       if (!ret) {
+               ret = -EIO;
                goto error_unmap_src;
+       }
 
        ret = qce_dma_prep_sgs(&qce->dma, req->src, rctx->src_nents,
                               &rctx->result_sg, 1, qce_ahash_done, async_req);
index 3d27cd5..5b493fd 100644 (file)
@@ -124,15 +124,15 @@ 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) {
-               ret = dst_nents;
+       if (!dst_nents) {
+               ret = -EIO;
                goto error_free;
        }
 
        if (diff_dst) {
                src_nents = dma_map_sg(qce->dev, req->src, rctx->src_nents, dir_src);
-               if (src_nents < 0) {
-                       ret = src_nents;
+               if (!src_nents) {
+                       ret = -EIO;
                        goto error_unmap_dst;
                }
                rctx->src_sg = req->src;