| Message ID | 1458493412-17103-1-git-send-email-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
>>>>> "Colin" == Colin King <colin.king@canonical.com> writes:
Colin> From: Colin Ian King <colin.king@canonical.com> 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!
> -----Original Message----- > From: Colin King [mailto:colin.king@canonical.com] > Sent: Sunday, March 20, 2016 10:34 PM > To: Kashyap Desai; Sumit Saxena; James Bottomley; Martin K . Petersen; > megaraidlinux.pdl@avagotech.com; linux-scsi@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Subject: [PATCH] megaraid_sas: fix missing { }, nullify kbuff_arr[i] only when > necessary > > From: Colin Ian King <colin.king@canonical.com> > > 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 <colin.king@canonical.com> > --- > 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 <sumit.saxena@broadcom.com> > -- > 2.7.3 -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
>>>>> "Colin" == Colin King <colin.king@canonical.com> 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!
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);