crypto: allwinner - Fix dma_map_sg error check

dma_map_sg return 0 on error.

Cc: Corentin Labbe <clabbe.montjoie@gmail.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Jernej Skrabec <jernej.skrabec@gmail.com>
Cc: Samuel Holland <samuel@sholland.org>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Minghao Chi <chi.minghao@zte.com.cn>
Cc: Peng Wu <wupeng58@huawei.com>
Cc: Alexey Khoroshilov <khoroshilov@ispras.ru>
Cc: linux-crypto@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-sunxi@lists.linux.dev
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>

diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c
index 74b4e910a38d7bd790bf95dc817502d62d3cf947..be7f46faef7e6e3d12a7c68b3af1a22e0d2f7e07 100644 (file)
--- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c
+++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c
@@ -208,7 +208,7 @@ static int sun8i_ce_cipher_prepare(struct crypto_engine *engine, void *async_req
 
        if (areq->src == areq->dst) {
                nr_sgs = dma_map_sg(ce->dev, areq->src, ns, DMA_BIDIRECTIONAL);
-               if (nr_sgs <= 0 || nr_sgs > MAX_SG) {
+               if (!nr_sgs || nr_sgs > MAX_SG) {
                        dev_err(ce->dev, "Invalid sg number %d\n", nr_sgs);
                        err = -EINVAL;
                        goto theend_iv;
@@ -216,13 +216,13 @@ static int sun8i_ce_cipher_prepare(struct crypto_engine *engine, void *async_req
                nr_sgd = nr_sgs;
        } else {
                nr_sgs = dma_map_sg(ce->dev, areq->src, ns, DMA_TO_DEVICE);
-               if (nr_sgs <= 0 || nr_sgs > MAX_SG) {
+               if (!nr_sgs || nr_sgs > MAX_SG) {
                        dev_err(ce->dev, "Invalid sg number %d\n", nr_sgs);
                        err = -EINVAL;
                        goto theend_iv;
                }
                nr_sgd = dma_map_sg(ce->dev, areq->dst, nd, DMA_FROM_DEVICE);
-               if (nr_sgd <= 0 || nr_sgd > MAX_SG) {
+               if (!nr_sgd || nr_sgd > MAX_SG) {
                        dev_err(ce->dev, "Invalid sg number %d\n", nr_sgd);
                        err = -EINVAL;
                        goto theend_sgs;

diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c
index 8b5b9b9d04c34217698755df18c77de43d5088de..0e6843ec197f41efc1234cd7cd82995fdb49f622 100644 (file)
--- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c
+++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c
@@ -389,7 +389,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq)
        cet->t_asym_ctl = 0;
 
        nr_sgs = dma_map_sg(ce->dev, areq->src, ns, DMA_TO_DEVICE);
-       if (nr_sgs <= 0 || nr_sgs > MAX_SG) {
+       if (!nr_sgs || nr_sgs > MAX_SG) {
                dev_err(ce->dev, "Invalid sg number %d\n", nr_sgs);
                err = -EINVAL;
                goto theend;

diff --git a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c
index 910d6751644cf673ea218cb346d2cf6e7ba6ac8a..fdcc98cdecaa86e9ab7734c112c4d29bc9bdc1a7 100644 (file)
--- a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c
+++ b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c
@@ -232,13 +232,13 @@ static int sun8i_ss_cipher(struct skcipher_request *areq)
                nr_sgd = nr_sgs;
        } else {
                nr_sgs = dma_map_sg(ss->dev, areq->src, nsgs, DMA_TO_DEVICE);
-               if (nr_sgs <= 0 || nr_sgs > 8) {
+               if (!nr_sgs || nr_sgs > 8) {
                        dev_err(ss->dev, "Invalid sg number %d\n", nr_sgs);
                        err = -EINVAL;
                        goto theend_iv;
                }
                nr_sgd = dma_map_sg(ss->dev, areq->dst, nsgd, DMA_FROM_DEVICE);
-               if (nr_sgd <= 0 || nr_sgd > 8) {
+               if (!nr_sgd || nr_sgd > 8) {
                        dev_err(ss->dev, "Invalid sg number %d\n", nr_sgd);
                        err = -EINVAL;
                        goto theend_sgs;

diff --git a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c
index 36a82b22953cd8b41236bf25649b73d677f9cf8d..fcb8c41cc957cc061894ec0d92b0a888e6c0243c 100644 (file)
--- a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c
+++ b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c
@@ -527,7 +527,7 @@ int sun8i_ss_hash_run(struct crypto_engine *engine, void *breq)
        rctx->method = ss->variant->alg_hash[algt->ss_algo_id];
 
        nr_sgs = dma_map_sg(ss->dev, areq->src, sg_nents(areq->src), DMA_TO_DEVICE);
-       if (nr_sgs <= 0 || nr_sgs > MAX_SG) {
+       if (!nr_sgs || nr_sgs > MAX_SG) {
                dev_err(ss->dev, "Invalid sg number %d\n", nr_sgs);
                err = -EINVAL;
                goto theend;