Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1706585 > unrolled thread
| Started by | Pan Bian <bianpan2016@163.com> |
|---|---|
| First post | 2017-08-08 16:00 +0200 |
| Last post | 2017-08-11 02:10 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
scsi: qla2xxx: use dma_mapping_error to check map errors Pan Bian <bianpan2016@163.com> - 2017-08-08 16:00 +0200
Re: scsi: qla2xxx: use dma_mapping_error to check map errors "Madhani, Himanshu" <Himanshu.Madhani@cavium.com> - 2017-08-08 17:30 +0200
Re: scsi: qla2xxx: use dma_mapping_error to check map errors "Martin K. Petersen" <martin.petersen@oracle.com> - 2017-08-11 02:10 +0200
| From | Pan Bian <bianpan2016@163.com> |
|---|---|
| Date | 2017-08-08 16:00 +0200 |
| Subject | scsi: qla2xxx: use dma_mapping_error to check map errors |
| Message-ID | <ucdd7-Hf-3@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | "Madhani, Himanshu" <Himanshu.Madhani@cavium.com> |
|---|---|
| Date | 2017-08-08 17:30 +0200 |
| Message-ID | <uceCd-1Tv-5@gated-at.bofh.it> |
| In reply to | #1706585 |
> 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
[toc] | [prev] | [next] | [standalone]
| From | "Martin K. Petersen" <martin.petersen@oracle.com> |
|---|---|
| Date | 2017-08-11 02:10 +0200 |
| Message-ID | <ud5Gy-4IP-9@gated-at.bofh.it> |
| In reply to | #1706585 |
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web