2016-03-20 17:03:46

by Colin King

Subject: [PATCH] megaraid_sas: fix missing { }, nullify kbuff_arr[i] only when necessary

From: Colin Ian King <[email protected]>

Fix missing { } on if statement, this change will nullify kbuff_arr[i]
only where necessary as the code intended.

detected using static analysis with smatch

Signed-off-by: Colin Ian King <[email protected]>
---
drivers/scsi/megaraid/megaraid_sas_base.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 69d375b..e6ebc7a 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -6656,12 +6656,13 @@ out:
}

for (i = 0; i < ioc->sge_count; i++) {
- if (kbuff_arr[i])
+ if (kbuff_arr[i]) {
dma_free_coherent(&instance->pdev->dev,
le32_to_cpu(kern_sge32[i].length),
kbuff_arr[i],
le32_to_cpu(kern_sge32[i].phys_addr));
kbuff_arr[i] = NULL;
+ }
}

megasas_return_cmd(instance, cmd);
--
2.7.3

2016-03-22 00:31:40

by Martin K. Petersen

Subject: Re: [PATCH] megaraid_sas: fix missing { }, nullify kbuff_arr[i] only when necessary

>>>>> "Colin" == Colin King <[email protected]> writes:

Colin> From: Colin Ian King <[email protected]> Fix missing { }
Colin> on if statement, this change will nullify kbuff_arr[i] only where
Colin> necessary as the code intended.

Colin> detected using static analysis with smatch

Kashyap/Sumit: Please review.

Thanks!

--
Martin K. Petersen Oracle Linux Engineering

2016-03-22 11:42:31

by Sumit Saxena

Subject: RE: [PATCH] megaraid_sas: fix missing { }, nullify kbuff_arr[i] only when necessary

> -----Original Message-----
> From: Colin King [mailto:[email protected]]
> Sent: Sunday, March 20, 2016 10:34 PM
> To: Kashyap Desai; Sumit Saxena; James Bottomley; Martin K . Petersen;
> [email protected]; [email protected]
> Cc: [email protected]
> Subject: [PATCH] megaraid_sas: fix missing { }, nullify kbuff_arr[i]
only when
> necessary
>
> From: Colin Ian King <[email protected]>
>
> Fix missing { } on if statement, this change will nullify kbuff_arr[i]
only where
> necessary as the code intended.
>
> detected using static analysis with smatch
>
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> drivers/scsi/megaraid/megaraid_sas_base.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c
> b/drivers/scsi/megaraid/megaraid_sas_base.c
> index 69d375b..e6ebc7a 100644
> --- a/drivers/scsi/megaraid/megaraid_sas_base.c
> +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
> @@ -6656,12 +6656,13 @@ out:
> }
>
> for (i = 0; i < ioc->sge_count; i++) {
> - if (kbuff_arr[i])
> + if (kbuff_arr[i]) {
> dma_free_coherent(&instance->pdev->dev,
>
le32_to_cpu(kern_sge32[i].length),
> kbuff_arr[i],
>
> le32_to_cpu(kern_sge32[i].phys_addr));
> kbuff_arr[i] = NULL;
> + }
> }
>
> megasas_return_cmd(instance, cmd);

Acked-by: Sumit Saxena <[email protected]>

> --
> 2.7.3

2016-03-23 20:44:45

by Martin K. Petersen

Subject: Re: [PATCH] megaraid_sas: fix missing { }, nullify kbuff_arr[i] only when necessary

>>>>> "Colin" == Colin King <[email protected]> writes:

Colin,

Colin> Fix missing { } on if statement, this change will nullify
Colin> kbuff_arr[i] only where necessary as the code intended.

Arnd beat you to it. We already have a patch for this.

Thanks!

--
Martin K. Petersen Oracle Linux Engineering