lkml.org 
[lkml]   [2021]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/3] scsi: mptfusion: Fix error return code of mptctl_hp_hostinfo()
    Date
    Ensure that all "goto out" error branches return correct error codes.
    Currently, always returns 0.

    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
    ---
    drivers/message/fusion/mptctl.c | 20 ++++++++++++--------
    1 file changed, 12 insertions(+), 8 deletions(-)

    diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
    index 72025996cd70..57bf511245b6 100644
    --- a/drivers/message/fusion/mptctl.c
    +++ b/drivers/message/fusion/mptctl.c
    @@ -2326,7 +2326,7 @@ mptctl_hp_hostinfo(MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size)
    ToolboxIstwiReadWriteRequest_t *IstwiRWRequest;
    MPT_FRAME_HDR *mf = NULL;
    unsigned long timeleft;
    - int retval;
    + int retval = 0;
    u32 msgcontext;

    /* Reset long to int. Should affect IA64 and SPARC only
    @@ -2453,6 +2453,7 @@ mptctl_hp_hostinfo(MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size)
    if ((mf = mpt_get_msg_frame(mptctl_id, ioc)) == NULL) {
    dfailprintk(ioc, printk(MYIOC_s_WARN_FMT
    "%s, no msg frames!!\n", ioc->name, __func__));
    + retval = -EFAULT;
    goto out;
    }

    @@ -2471,12 +2472,13 @@ mptctl_hp_hostinfo(MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size)
    IstwiRWRequest->DeviceAddr = 0xB0;

    pbuf = pci_alloc_consistent(ioc->pcidev, 4, &buf_dma);
    - if (!pbuf)
    + if (!pbuf) {
    + retval = -ENOMEM;
    goto out;
    + }
    ioc->add_sge((char *)&IstwiRWRequest->SGL,
    (MPT_SGE_FLAGS_SSIMPLE_READ|4), buf_dma);

    - retval = 0;
    SET_MGMT_MSG_CONTEXT(ioc->ioctl_cmds.msg_context,
    IstwiRWRequest->MsgContext);
    INITIALIZE_MGMT_STATUS(ioc->ioctl_cmds.status)
    @@ -2486,10 +2488,10 @@ mptctl_hp_hostinfo(MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size)
    timeleft = wait_for_completion_timeout(&ioc->ioctl_cmds.done,
    HZ*MPT_IOCTL_DEFAULT_TIMEOUT);
    if (!(ioc->ioctl_cmds.status & MPT_MGMT_STATUS_COMMAND_GOOD)) {
    - retval = -ETIME;
    printk(MYIOC_s_WARN_FMT "%s: failed\n", ioc->name, __func__);
    if (ioc->ioctl_cmds.status & MPT_MGMT_STATUS_DID_IOCRESET) {
    mpt_free_msg_frame(ioc, mf);
    + retval = -ETIME;
    goto out;
    }
    if (!timeleft) {
    @@ -2497,9 +2499,11 @@ mptctl_hp_hostinfo(MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size)
    "HOST INFO command timeout, doorbell=0x%08x\n",
    ioc->name, mpt_GetIocState(ioc, 0));
    mptctl_timeout_expired(ioc, mf);
    - } else
    - goto retry_wait;
    - goto out;
    + retval = -ETIME;
    + goto out;
    + }
    +
    + goto retry_wait;
    }

    /*
    @@ -2530,7 +2534,7 @@ mptctl_hp_hostinfo(MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size)
    return -EFAULT;
    }

    - return 0;
    + return retval;

    }

    --
    2.21.1

    \
     
     \ /
      Last update: 2021-04-08 08:19    [W:4.420 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site