From patchwork Thu Apr 8 06:18:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhen Lei X-Patchwork-Id: 417401 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp261237jai; Wed, 7 Apr 2021 23:19:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3yAEQnJpw6RSbIenrAhjN+VK7Vo99Xq8qFcUzRHdc4vlkH8byeEzq/rRQaigpNnpls4D9 X-Received: by 2002:a17:906:5597:: with SMTP id y23mr8374421ejp.165.1617862768490; Wed, 07 Apr 2021 23:19:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617862768; cv=none; d=google.com; s=arc-20160816; b=OF+rhh61qoDAt8HmL5NfSOx7oZYgnf+BdZ8uaFEOhIhfyl8zG2YaiyoxdcirQNMvtF xr78YnLOEzSEQLPmUJLW6k0wX/5mvy5Gg4tEYQIHYMldwe7GJwpX9nH41HB2IB+w+KNu uhKxwwmeuJEOG+QHuA9D2hhCMcRqomhOtWn0gn4p1atnwJqThVri/hyg7LJQRdTyGBHu nGLTFBoVElvqyD1oR1lkP60yVivWg/M6x98B5mhnzT1z3olyzInQzwY6deYoQ/MzlDLK mF2jEbEWJ7yMTxLEitlYJEyKtd1rMXmS2SkqI1AkHw/tqs+fTRDEhfs+85/TxpRNhjvM EZaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=pod6+4hJ6aVV4ABzs1MXDpb5TxAQGf0WOYUDlN4cQ3k=; b=MfGTjyBighDn/TdKrI+ehaIXrg6eHsxFn29hganpNYPToEsfUg5rbNAEdWCpI4Ceos X3mgmSto9+DYoDvjqbf1HhFoTUSV0QuBzaBAYLahEDkLU13no62N0xRV4u6aQ3uPazDx 3ts9wvwWfOtAh/Y8KZRkMdfN6FVPXEETO+JEGQLyG/bx18Mb4UtFKYRuzllUZFBpB06O u84e9/nuBUfoP9KluvljC0qOVSh9f4o1Iv3KN0ajzUiZV4gzaX/5AzyOqZmwqy29q3j+ 0o4AO4KYE0T9Bd2QOMKbLLYyReVfRUihe3vfI4ix6Wq2FPpiOtfk51Ia0NpkqzuoptPf r+Uw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hq19si21496540ejc.88.2021.04.07.23.19.28 for ; Wed, 07 Apr 2021 23:19:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230308AbhDHGTg (ORCPT ); Thu, 8 Apr 2021 02:19:36 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:15962 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231129AbhDHGT3 (ORCPT ); Thu, 8 Apr 2021 02:19:29 -0400 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4FG9yp52Z9zyNZ9; Thu, 8 Apr 2021 14:17:06 +0800 (CST) Received: from thunder-town.china.huawei.com (10.174.179.202) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.498.0; Thu, 8 Apr 2021 14:19:08 +0800 From: Zhen Lei To: Sathya Prakash , Sreekanth Reddy , Suganath Prabu Subramani , "MPT-FusionLinux . pdl" , linux-scsi , linux-kernel CC: Zhen Lei Subject: [PATCH 3/3] scsi: mptfusion: Fix error return code of mptctl_hp_hostinfo() Date: Thu, 8 Apr 2021 14:18:51 +0800 Message-ID: <20210408061851.3089-4-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 In-Reply-To: <20210408061851.3089-1-thunder.leizhen@huawei.com> References: <20210408061851.3089-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.179.202] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Ensure that all "goto out" error branches return correct error codes. Currently, always returns 0. Reported-by: Hulk Robot Signed-off-by: Zhen Lei --- drivers/message/fusion/mptctl.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) -- 2.21.1 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; }