[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220826095615.74328-2-jinpu.wang@ionos.com>
Date: Fri, 26 Aug 2022 11:56:14 +0200
From: Jack Wang <jinpu.wang@...os.com>
To: jgg@...pe.ca, leon@...nel.org, linux-rdma@...r.kernel.org
Cc: Christophe JAILLET <christophe.jaillet@...adoo.fr>,
Kees Cook <keescook@...omium.org>,
Håkon Bugge <haakon.bugge@...cle.com>,
linux-kernel@...r.kernel.org
Subject: [PATCH 1/2] infiniband/mthca: Fix dma_map_sg error check
dma_map_sg return 0 on error, in case of error set
EIO as return code.
Cc: Jason Gunthorpe <jgg@...pe.ca>
Cc: Leon Romanovsky <leon@...nel.org>
Cc: Christophe JAILLET <christophe.jaillet@...adoo.fr>
Cc: Kees Cook <keescook@...omium.org>
Cc: "Håkon Bugge" <haakon.bugge@...cle.com>
Cc: linux-rdma@...r.kernel.org
Cc: linux-kernel@...r.kernel.org
Fixes: 56483ec1b702 ("[PATCH] IB uverbs: add mthca user doorbell record support")
Signed-off-by: Jack Wang <jinpu.wang@...os.com>
Reviewed-by: Kees Cook <keescook@...omium.org>
---
drivers/infiniband/hw/mthca/mthca_memfree.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniband/hw/mthca/mthca_memfree.c
index f2734a5c5f26..44fd5fdf64d5 100644
--- a/drivers/infiniband/hw/mthca/mthca_memfree.c
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.c
@@ -189,7 +189,7 @@ struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages,
chunk->npages,
DMA_BIDIRECTIONAL);
- if (chunk->nsg <= 0)
+ if (!chunk->nsg)
goto fail;
}
@@ -208,7 +208,7 @@ struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages,
chunk->nsg = dma_map_sg(&dev->pdev->dev, chunk->mem,
chunk->npages, DMA_BIDIRECTIONAL);
- if (chunk->nsg <= 0)
+ if (!chunk->nsg)
goto fail;
}
@@ -482,8 +482,9 @@ int mthca_map_user_db(struct mthca_dev *dev, struct mthca_uar *uar,
ret = dma_map_sg(&dev->pdev->dev, &db_tab->page[i].mem, 1,
DMA_TO_DEVICE);
- if (ret < 0) {
+ if (!ret) {
unpin_user_page(pages[0]);
+ ret = -EIO;
goto out;
}
--
2.34.1
Powered by blists - more mailing lists