hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: amlogic - Fix dma_map_sg error check

Browse Source 
dma_map_sg return 0 on error.

Cc: Corentin Labbe <clabbe@baylibre.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org
Cc: linux-amlogic@lists.infradead.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>
This commit is contained in:
Jack Wang 2022-08-19 08:07:52 +02:00 committed by Herbert Xu
parent 417f62f640
commit 45fa321e7d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/crypto/amlogic/amlogic-gxl-cipher.c
View File

@ -177,7 +177,7 @@ static int meson_cipher(struct skcipher_request *areq)
if (areq->src == areq->dst) { if (areq->src == areq->dst) {
nr_sgs = dma_map_sg(mc->dev, areq->src, sg_nents(areq->src), nr_sgs = dma_map_sg(mc->dev, areq->src, sg_nents(areq->src),
DMA_BIDIRECTIONAL); DMA_BIDIRECTIONAL);
if (nr_sgs < 0) { if (!nr_sgs) {
dev_err(mc->dev, "Invalid SG count %d\n", nr_sgs); dev_err(mc->dev, "Invalid SG count %d\n", nr_sgs);
err = -EINVAL; err = -EINVAL;
goto theend; goto theend;
@ -186,14 +186,14 @@ static int meson_cipher(struct skcipher_request *areq)
} else { } else {
nr_sgs = dma_map_sg(mc->dev, areq->src, sg_nents(areq->src), nr_sgs = dma_map_sg(mc->dev, areq->src, sg_nents(areq->src),
DMA_TO_DEVICE); DMA_TO_DEVICE);
if (nr_sgs < 0 || nr_sgs > MAXDESC - 3) { if (!nr_sgs || nr_sgs > MAXDESC - 3) {
dev_err(mc->dev, "Invalid SG count %d\n", nr_sgs); dev_err(mc->dev, "Invalid SG count %d\n", nr_sgs);
err = -EINVAL; err = -EINVAL;
goto theend; goto theend;
} }
nr_sgd = dma_map_sg(mc->dev, areq->dst, sg_nents(areq->dst), nr_sgd = dma_map_sg(mc->dev, areq->dst, sg_nents(areq->dst),
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
if (nr_sgd < 0 || nr_sgd > MAXDESC - 3) { if (!nr_sgd || nr_sgd > MAXDESC - 3) {
dev_err(mc->dev, "Invalid SG count %d\n", nr_sgd); dev_err(mc->dev, "Invalid SG count %d\n", nr_sgd);
err = -EINVAL; err = -EINVAL;
goto theend; goto theend;