* [PATCH] scsi: aic94xx: Add missing check for dma_map_single
@ 2023-01-28 11:08 Jiasheng Jiang
2023-01-30 13:31 ` Jason Yan
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jiasheng Jiang @ 2023-01-28 11:08 UTC (permalink / raw)
To: yanaijie
Cc: jejb, martin.petersen, john.garry, damien.lemoal, linux-scsi,
linux-kernel, Jiasheng Jiang
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 <jiasheng@iscas.ac.cn>
---
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] scsi: aic94xx: Add missing check for dma_map_single
2023-01-28 11:08 [PATCH] scsi: aic94xx: Add missing check for dma_map_single Jiasheng Jiang
@ 2023-01-30 13:31 ` Jason Yan
2023-02-09 0:12 ` Martin K. Petersen
2023-02-14 16:57 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Jason Yan @ 2023-01-30 13:31 UTC (permalink / raw)
To: Jiasheng Jiang
Cc: jejb, martin.petersen, john.garry, damien.lemoal, linux-scsi,
linux-kernel
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 <jiasheng@iscas.ac.cn>
> ---
> 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 <yanaijie@huawei.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] scsi: aic94xx: Add missing check for dma_map_single
2023-01-28 11:08 [PATCH] scsi: aic94xx: Add missing check for dma_map_single Jiasheng Jiang
2023-01-30 13:31 ` Jason Yan
@ 2023-02-09 0:12 ` Martin K. Petersen
2023-02-14 16:57 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Martin K. Petersen @ 2023-02-09 0:12 UTC (permalink / raw)
To: Jiasheng Jiang
Cc: yanaijie, jejb, martin.petersen, john.garry, damien.lemoal,
linux-scsi, linux-kernel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] scsi: aic94xx: Add missing check for dma_map_single
2023-01-28 11:08 [PATCH] scsi: aic94xx: Add missing check for dma_map_single Jiasheng Jiang
2023-01-30 13:31 ` Jason Yan
2023-02-09 0:12 ` Martin K. Petersen
@ 2023-02-14 16:57 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Martin K. Petersen @ 2023-02-14 16:57 UTC (permalink / raw)
To: yanaijie, Jiasheng Jiang
Cc: Martin K . Petersen, jejb, john.garry, damien.lemoal, linux-scsi,
linux-kernel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-14 16:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-28 11:08 [PATCH] scsi: aic94xx: Add missing check for dma_map_single Jiasheng Jiang
2023-01-30 13:31 ` Jason Yan
2023-02-09 0:12 ` Martin K. Petersen
2023-02-14 16:57 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®