* scsi: qla2xxx: use dma_mapping_error to check map errors
@ 2017-08-08 13:55 Pan Bian
2017-08-08 15:24 ` Madhani, Himanshu
2017-08-11 0:06 ` Martin K. Petersen
0 siblings, 2 replies; 3+ messages in thread
From: Pan Bian @ 2017-08-08 13:55 UTC (permalink / raw)
To: qla2xxx-upstream, James E.J. Bottomley, Martin K. Petersen
Cc: linux-scsi, linux-kernel, Pan Bian
The return value of dma_map_single() should be checked by
dma_mapping_error(). However, in function qla26xx_dport_diagnostics(), its
return value is checked against NULL, which could result in failures.
Signed-off-by: Pan Bian <bianpan2016@163.com>
---
drivers/scsi/qla2xxx/qla_mbx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 7c6d1a4..eafb709 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -5817,7 +5817,7 @@ struct cs84xx_mgmt_cmd {
dd_dma = dma_map_single(&vha->hw->pdev->dev,
dd_buf, size, DMA_FROM_DEVICE);
- if (!dd_dma) {
+ if (dma_mapping_error(&vha->hw->pdev->dev, dd_dma)) {
ql_log(ql_log_warn, vha, 0x1194, "Failed to map dma buffer.\n");
return QLA_MEMORY_ALLOC_FAILED;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: scsi: qla2xxx: use dma_mapping_error to check map errors
2017-08-08 13:55 scsi: qla2xxx: use dma_mapping_error to check map errors Pan Bian
@ 2017-08-08 15:24 ` Madhani, Himanshu
2017-08-11 0:06 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Madhani, Himanshu @ 2017-08-08 15:24 UTC (permalink / raw)
To: Pan Bian
Cc: Dept-Eng QLA2xxx Upstream, James E.J. Bottomley,
Martin K. Petersen, Linux SCSI Mailinglist,
linux-kernel@vger.kernel.org
> On Aug 8, 2017, at 6:55 AM, Pan Bian <bianpan2016@163.com> wrote:
>
> The return value of dma_map_single() should be checked by
> dma_mapping_error(). However, in function qla26xx_dport_diagnostics(), its
> return value is checked against NULL, which could result in failures.
>
> Signed-off-by: Pan Bian <bianpan2016@163.com>
> ---
> drivers/scsi/qla2xxx/qla_mbx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
> index 7c6d1a4..eafb709 100644
> --- a/drivers/scsi/qla2xxx/qla_mbx.c
> +++ b/drivers/scsi/qla2xxx/qla_mbx.c
> @@ -5817,7 +5817,7 @@ struct cs84xx_mgmt_cmd {
>
> dd_dma = dma_map_single(&vha->hw->pdev->dev,
> dd_buf, size, DMA_FROM_DEVICE);
> - if (!dd_dma) {
> + if (dma_mapping_error(&vha->hw->pdev->dev, dd_dma)) {
> ql_log(ql_log_warn, vha, 0x1194, "Failed to map dma buffer.\n");
> return QLA_MEMORY_ALLOC_FAILED;
> }
> --
> 1.9.1
>
>
Looks Good. Thanks for the patch
Acked-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Thanks,
- Himanshu
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: scsi: qla2xxx: use dma_mapping_error to check map errors
2017-08-08 13:55 scsi: qla2xxx: use dma_mapping_error to check map errors Pan Bian
2017-08-08 15:24 ` Madhani, Himanshu
@ 2017-08-11 0:06 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Martin K. Petersen @ 2017-08-11 0:06 UTC (permalink / raw)
To: Pan Bian
Cc: qla2xxx-upstream, James E.J. Bottomley, Martin K. Petersen,
linux-scsi, linux-kernel
Pan,
> The return value of dma_map_single() should be checked by
> dma_mapping_error(). However, in function qla26xx_dport_diagnostics(),
> its return value is checked against NULL, which could result in
> failures.
Applied to 4.14/scsi-queue.
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-08-11 0:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-08 13:55 scsi: qla2xxx: use dma_mapping_error to check map errors Pan Bian
2017-08-08 15:24 ` Madhani, Himanshu
2017-08-11 0:06 ` 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