2023-01-28 11:08:47

by Jiasheng Jiang

Subject: [PATCH] scsi: aic94xx: Add missing check for dma_map_single

Add check for dma_map_single and return error if it fails in order
to avoid invalid dma address.

Fixes: 2908d778ab3e ("[SCSI] aic94xx: new driver")
Signed-off-by: Jiasheng Jiang <[email protected]>
---
drivers/scsi/aic94xx/aic94xx_task.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
index ed119a3f6f2e..7f0208300110 100644
--- a/drivers/scsi/aic94xx/aic94xx_task.c
+++ b/drivers/scsi/aic94xx/aic94xx_task.c
@@ -50,6 +50,9 @@ static int asd_map_scatterlist(struct sas_task *task,
dma_addr_t dma = dma_map_single(&asd_ha->pcidev->dev, p,
task->total_xfer_len,
task->data_dir);
+ if (dma_mapping_error(&asd_ha->pcidev->dev, dma))
+ return -ENOMEM;
+
sg_arr[0].bus_addr = cpu_to_le64((u64)dma);
sg_arr[0].size = cpu_to_le32(task->total_xfer_len);
sg_arr[0].flags |= ASD_SG_EL_LIST_EOL;
--
2.25.1

2023-01-30 13:31:41

by Jason Yan

Subject: Re: [PATCH] scsi: aic94xx: Add missing check for dma_map_single

On 2023/1/28 19:08, Jiasheng Jiang wrote:
> Add check for dma_map_single and return error if it fails in order
> to avoid invalid dma address.
>
> Fixes: 2908d778ab3e ("[SCSI] aic94xx: new driver")
> Signed-off-by: Jiasheng Jiang <[email protected]>
> ---
> drivers/scsi/aic94xx/aic94xx_task.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
> index ed119a3f6f2e..7f0208300110 100644
> --- a/drivers/scsi/aic94xx/aic94xx_task.c
> +++ b/drivers/scsi/aic94xx/aic94xx_task.c
> @@ -50,6 +50,9 @@ static int asd_map_scatterlist(struct sas_task *task,
> dma_addr_t dma = dma_map_single(&asd_ha->pcidev->dev, p,
> task->total_xfer_len,
> task->data_dir);
> + if (dma_mapping_error(&asd_ha->pcidev->dev, dma))
> + return -ENOMEM;
> +
> sg_arr[0].bus_addr = cpu_to_le64((u64)dma);
> sg_arr[0].size = cpu_to_le32(task->total_xfer_len);
> sg_arr[0].flags |= ASD_SG_EL_LIST_EOL;
>

Reviewed-by: Jason Yan <[email protected]>

2023-02-09 00:13:19

by Martin K. Petersen

Subject: Re: [PATCH] scsi: aic94xx: Add missing check for dma_map_single

Jiasheng,

> Add check for dma_map_single and return error if it fails in order
> to avoid invalid dma address.

Applied to 6.3/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering

2023-02-14 16:59:26

by Martin K. Petersen

Subject: Re: [PATCH] scsi: aic94xx: Add missing check for dma_map_single

On Sat, 28 Jan 2023 19:08:32 +0800, Jiasheng Jiang wrote:

> Add check for dma_map_single and return error if it fails in order
> to avoid invalid dma address.
>
>

Applied to 6.3/scsi-queue, thanks!

[1/1] scsi: aic94xx: Add missing check for dma_map_single
https://git.kernel.org/mkp/scsi/c/32fe45274edb

--
Martin K. Petersen Oracle Linux Engineering