| Message ID | 20230128110832.6792-1-jiasheng@iscas.ac.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | scsi: aic94xx: Add missing check for dma_map_single | expand |
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>
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!
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
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;
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(+)