lkml.org 
[lkml]   [2016]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 132/170] megaraid_sas: add missing curly braces in ioctl handler
    Date
    3.19.8-ckt18 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Arnd Bergmann <arnd@arndb.de>

    commit 3deb9438d34a09f6796639b652a01d110aca9f75 upstream.

    gcc-6 found a dubious indentation in the megasas_mgmt_fw_ioctl
    function:

    drivers/scsi/megaraid/megaraid_sas_base.c: In function 'megasas_mgmt_fw_ioctl':
    drivers/scsi/megaraid/megaraid_sas_base.c:6658:4: warning: statement is indented as if it were guarded by... [-Wmisleading-indentation]
    kbuff_arr[i] = NULL;
    ^~~~~~~~~
    drivers/scsi/megaraid/megaraid_sas_base.c:6653:3: note: ...this 'if' clause, but it is not
    if (kbuff_arr[i])
    ^~

    The code is actually correct, as there is no downside in clearing a NULL
    pointer again.

    This clarifies the code and avoids the warning by adding extra curly
    braces.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Fixes: 90dc9d98f01b ("megaraid_sas : MFI MPT linked list corruption fix")
    Reviewed-by: Hannes Reinecke <hare@suse.com>
    Acked-by: Sumit Saxena <sumit.saxena@broadcom.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Kamal Mostafa <kamal@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 8aa917a..a060b1e 100644
    --- a/drivers/scsi/megaraid/megaraid_sas_base.c
    +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
    @@ -6195,12 +6195,13 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance,
    }

    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;
    + }
    }

    if (instance->ctrl_context && cmd->mpt_pthr_cmd_blocked)
    --
    2.7.4
    \
     
     \ /
      Last update: 2016-04-02 03:41    [W:4.330 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site