lkml.org 
[lkml]   [2020]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 015/179] scsi: mpt3sas: Fix error returns in BRM_status_show
    Date
    From: Johannes Thumshirn <johannes.thumshirn@wdc.com>

    [ Upstream commit 0fd181456aa0826057adbfb6c79c40f4083cfd75 ]

    BRM_status_show() has several error branches, but none of them record the
    error in the error return.

    Also while at it remove the manual mutex_unlock() of the pci_access_mutex
    in case of an ongoing pci error recovery or host removal and jump to the
    cleanup label instead.

    Note: We can safely jump to out from here as io_unit_pg3 is initialized to
    NULL and if it hasn't been allocated, kfree() skips the NULL pointer.

    [mkp: compilation warning]

    Link: https://lore.kernel.org/r/20200701131454.5255-1-johannes.thumshirn@wdc.com
    Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
    Acked-by: Sreekanth Reddy <sreekanth.reddy@broadcom.com>
    Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/mpt3sas/mpt3sas_ctl.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
    index e94e72de2fc68..983e568ff2317 100644
    --- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c
    +++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
    @@ -3149,15 +3149,14 @@ BRM_status_show(struct device *cdev, struct device_attribute *attr,
    }
    /* pci_access_mutex lock acquired by sysfs show path */
    mutex_lock(&ioc->pci_access_mutex);
    - if (ioc->pci_error_recovery || ioc->remove_host) {
    - mutex_unlock(&ioc->pci_access_mutex);
    - return 0;
    - }
    + if (ioc->pci_error_recovery || ioc->remove_host)
    + goto out;

    /* allocate upto GPIOVal 36 entries */
    sz = offsetof(Mpi2IOUnitPage3_t, GPIOVal) + (sizeof(u16) * 36);
    io_unit_pg3 = kzalloc(sz, GFP_KERNEL);
    if (!io_unit_pg3) {
    + rc = -ENOMEM;
    ioc_err(ioc, "%s: failed allocating memory for iounit_pg3: (%d) bytes\n",
    __func__, sz);
    goto out;
    @@ -3167,6 +3166,7 @@ BRM_status_show(struct device *cdev, struct device_attribute *attr,
    0) {
    ioc_err(ioc, "%s: failed reading iounit_pg3\n",
    __func__);
    + rc = -EINVAL;
    goto out;
    }

    @@ -3174,12 +3174,14 @@ BRM_status_show(struct device *cdev, struct device_attribute *attr,
    if (ioc_status != MPI2_IOCSTATUS_SUCCESS) {
    ioc_err(ioc, "%s: iounit_pg3 failed with ioc_status(0x%04x)\n",
    __func__, ioc_status);
    + rc = -EINVAL;
    goto out;
    }

    if (io_unit_pg3->GPIOCount < 25) {
    ioc_err(ioc, "%s: iounit_pg3->GPIOCount less than 25 entries, detected (%d) entries\n",
    __func__, io_unit_pg3->GPIOCount);
    + rc = -EINVAL;
    goto out;
    }

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-07-27 16:33    [W:5.672 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site