Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 19 Nov 2020 11:30:50 -0400
From:   Jason Gunthorpe <jgg@nvidia.com>
To:     Xiongfeng Wang <wangxiongfeng2@huawei.com>
CC:     <dledford@redhat.com>, <linux-rdma@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] IB/mthca: fix return value of error branch in
 mthca_init_cq()
Message-ID: <20201119153050.GA1960484@nvidia.com>
References: <1605789529-54808-1-git-send-email-wangxiongfeng2@huawei.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <1605789529-54808-1-git-send-email-wangxiongfeng2@huawei.com>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from mlx.ziepe.ca (156.34.48.30) by MN2PR19CA0041.namprd19.prod.outlook.com (2603:10b6:208:19b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Thu, 19 Nov 2020 15:30:51 +0000
Received: from jgg by mlx with local (Exim 4.94)        (envelope-from <jgg@nvidia.com>)        id 1kflta-008FIr-Li; Thu, 19 Nov 2020 11:30:50 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1;
        t=1605799858; bh=bpxPmkk/QmdinUr1rcPJTGyxpgrcO/YAYQSLBpuzy/w=;
        h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Date:
         From:To:CC:Subject:Message-ID:References:Content-Type:
         Content-Disposition:In-Reply-To:X-ClientProxiedBy:MIME-Version:
         X-MS-Exchange-MessageSentRepresentingType;
        b=W66E96HYcoSD9CRgtSphzl4ESm2g2Y1RCkXtri18TT7OOktIXiwtShnACTzOTdHAy
         ULSmbTkiIyqWb+oZPG64GMRBk95xGQ7M24ELbSr63RHQmGblERL+BiqFV81x8neYQG
         F1OvZhfJrR2HzRVPxX0wE+y13kfiPoy/jMq3C2Hc7lkNJDpJAKfr1wpC82NKOj007b
         SrF4i0norNOmQR1Z5rH5eCvU4zZywZgTYD8MQW/abNwT/EuW5VfkvEFGOm1S+wNMgd
         /C13bUPFCsW+MhMVyRYKty8BlgpZftqMvGFoqSVn011O24U+hnczACzRa0o/DZintv
         CmGuFFkkS/fjA==
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Nov 19, 2020 at 08:38:49PM +0800, Xiongfeng Wang wrote:
> We return 'err' in the error branch, but this variable may be set as
> zero by the above code. Fix it by setting 'err'  as a negative value
> before we goto the error label.
> 
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Xiongfeng Wang <wangxiongfeng2@huawei.com>

Missing fixes line

>  drivers/infiniband/hw/mthca/mthca_cq.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c
> index c3cfea2..98d697b 100644
> --- a/drivers/infiniband/hw/mthca/mthca_cq.c
> +++ b/drivers/infiniband/hw/mthca/mthca_cq.c
> @@ -803,8 +803,10 @@ int mthca_init_cq(struct mthca_dev *dev, int nent,
>  	}
>  
>  	mailbox = mthca_alloc_mailbox(dev, GFP_KERNEL);
> -	if (IS_ERR(mailbox))
> +	if (IS_ERR(mailbox)) {
> +		err = -ENOMEM;
>  		goto err_out_arm;
> +	}

mthca_alloc_mailbox returns err_ptr so this should do 

   err = ERR_PTR(mailbox)

>  	cq_context = mailbox->buf;
>  
> @@ -850,6 +852,7 @@ int mthca_init_cq(struct mthca_dev *dev, int nent,
>  			    cq->cqn & (dev->limits.num_cqs - 1),
>  			    cq)) {
>  		spin_unlock_irq(&dev->cq_table.lock);
> +		err = -ENOMEM;

And this should assign err to the output of mthca_array_set

Please fix and resend.

Thanks,
Jason