Commit 417f62f6 authored by Jack Wang's avatar Jack Wang Committed by Herbert Xu
Browse files

crypto: qce - Fix dma_map_sg error check 



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: default avatarJack Wang <jinpu.wang@ionos.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 66f0b6b7

drivers/crypto/qce/aead.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

drivers/crypto/qce/sha.c

+5 −3
Original line number Diff line number Diff line
@@ -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);

drivers/crypto/qce/skcipher.c

+4 −4
Original line number Diff line number Diff line
@@ -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;