From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F1D4C63697 for ; Thu, 19 Nov 2020 15:31:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D8D8D24695 for ; Thu, 19 Nov 2020 15:31:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nvidia.com header.i=@nvidia.com header.b="W66E96HY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728062AbgKSPbB (ORCPT ); Thu, 19 Nov 2020 10:31:01 -0500 Received: from nat-hk.nvidia.com ([203.18.50.4]:2640 "EHLO nat-hk.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726691AbgKSPbA (ORCPT ); Thu, 19 Nov 2020 10:31:00 -0500 Received: from HKMAIL101.nvidia.com (Not Verified[10.18.92.77]) by nat-hk.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Thu, 19 Nov 2020 23:30:58 +0800 Received: from HKMAIL104.nvidia.com (10.18.16.13) by HKMAIL101.nvidia.com (10.18.16.10) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Thu, 19 Nov 2020 15:30:54 +0000 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.171) by HKMAIL104.nvidia.com (10.18.16.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Thu, 19 Nov 2020 15:30:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C3w1B5NqvLpnc7pOAIhdqWs9psiOf15COXaMj53eSVWKgFqKXaawJpjtRs8hFsEYeNdJbLYf2cqjnud5tJtPIEThsx8JD1kcMvrFghdVM0dRxd8KvNCRukN2E8YrFe+MTS8D/OsnwD/kfyVQufjanzJCSFegySvECGvGnBR57f6NpXUY7rklhIgD25sjB7d9DpIkJq9qZUC68nkH/nIvkZ8yFH17x9SsiFLPgqSqj4UBU0xmlBhABzE0J6RErds8thl8dqU7r8Qaks1zynx2vmX/TnbZIPzQdZZvqyg8rPxa5kH0XZ6/2a0P1iZ2RLMOcq7WCac47Wl72Beq7XBfNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bpxPmkk/QmdinUr1rcPJTGyxpgrcO/YAYQSLBpuzy/w=; b=ikA9SvEkkWdm09YvzIeWurDP5/1dKg0O8or8NHroQeMA7jLOoBOIq2hFXcL9iwL6BfXkAu6y9CYdJ5PQZSi7TRsjE5Xq1p3boU+sbw1YgZgL2ODhuCLS0lc/KlUDWwsQhcD11ICJQLZsXad6ipnq+aUp78UIK+2jHWPPcacw76Uk0lmWpX2cShF5ujVmQnGHgoHIFm/AZlLI0XmHk1dWJJlj3smWScK4hX6wkqmU+9nDsEUU4546jB5iWSRn8rFrytNxnnwx+ecAP5bnUD+ami5WirjoZv50OZroFZqFVNYzF/7grgjcokxrSqtRVHbtzcyV76/amF4mCSUy6BvObw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none Received: from DM6PR12MB3834.namprd12.prod.outlook.com (2603:10b6:5:14a::12) by DM5PR12MB1754.namprd12.prod.outlook.com (2603:10b6:3:10f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.28; Thu, 19 Nov 2020 15:30:52 +0000 Received: from DM6PR12MB3834.namprd12.prod.outlook.com ([fe80::e40c:730c:156c:2ef9]) by DM6PR12MB3834.namprd12.prod.outlook.com ([fe80::e40c:730c:156c:2ef9%7]) with mapi id 15.20.3589.022; Thu, 19 Nov 2020 15:30:52 +0000 Date: Thu, 19 Nov 2020 11:30:50 -0400 From: Jason Gunthorpe To: Xiongfeng Wang CC: , , 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> X-ClientProxiedBy: MN2PR19CA0041.namprd19.prod.outlook.com (2603:10b6:208:19b::18) To DM6PR12MB3834.namprd12.prod.outlook.com (2603:10b6:5:14a::12) 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 ) 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: 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 > Signed-off-by: Xiongfeng Wang 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