From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Fri, 2 Sep 2022 10:15:53 +0000 (+0800)
Subject: Revert "crypto: gemini - Fix error check for dma_map_sg"
X-Git-Tag: v6.1-rc5~148^2~61
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb1e1257b0cb93328f2909755b0fa2dc582cc508;p=platform%2Fkernel%2Flinux-starfive.git

Revert "crypto: gemini - Fix error check for dma_map_sg"

This reverts commit 545665ad1e84eb8f047018a2f607e78cef29c7fa.

The original code was correct and arguably more robust than the
patched version.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

diff --git a/drivers/crypto/gemini/sl3516-ce-cipher.c b/drivers/crypto/gemini/sl3516-ce-cipher.c
index 34fea8a..14d0d83 100644
--- a/drivers/crypto/gemini/sl3516-ce-cipher.c
+++ b/drivers/crypto/gemini/sl3516-ce-cipher.c
@@ -149,7 +149,7 @@ static int sl3516_ce_cipher(struct skcipher_request *areq)
 	if (areq->src == areq->dst) {
 		nr_sgs = dma_map_sg(ce->dev, areq->src, sg_nents(areq->src),
 				    DMA_BIDIRECTIONAL);
-		if (!nr_sgs || nr_sgs > MAXDESC / 2) {
+		if (nr_sgs <= 0 || nr_sgs > MAXDESC / 2) {
 			dev_err(ce->dev, "Invalid sg number %d\n", nr_sgs);
 			err = -EINVAL;
 			goto theend;
@@ -158,14 +158,14 @@ static int sl3516_ce_cipher(struct skcipher_request *areq)
 	} else {
 		nr_sgs = dma_map_sg(ce->dev, areq->src, sg_nents(areq->src),
 				    DMA_TO_DEVICE);
-		if (!nr_sgs || nr_sgs > MAXDESC / 2) {
+		if (nr_sgs <= 0 || nr_sgs > MAXDESC / 2) {
 			dev_err(ce->dev, "Invalid sg number %d\n", nr_sgs);
 			err = -EINVAL;
 			goto theend;
 		}
 		nr_sgd = dma_map_sg(ce->dev, areq->dst, sg_nents(areq->dst),
 				    DMA_FROM_DEVICE);
-		if (!nr_sgd || nr_sgd > MAXDESC) {
+		if (nr_sgd <= 0 || nr_sgd > MAXDESC) {
 			dev_err(ce->dev, "Invalid sg number %d\n", nr_sgd);
 			err = -EINVAL;
 			goto theend_sgs;