From patchwork Mon Dec 5 07:23:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pan Bian X-Patchwork-Id: 9460491 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3ED4C6022E for ; Mon, 5 Dec 2016 07:25:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2616224DA2 for ; Mon, 5 Dec 2016 07:25:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 19B3A25223; Mon, 5 Dec 2016 07:25:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5AF624DA2 for ; Mon, 5 Dec 2016 07:25:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751654AbcLEHYl (ORCPT ); Mon, 5 Dec 2016 02:24:41 -0500 Received: from m12-18.163.com ([220.181.12.18]:44699 "EHLO m12-18.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750951AbcLEHYh (ORCPT ); Mon, 5 Dec 2016 02:24:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=MDJdXCwPc8mPrOz41O 43AfkanlPCDu1a9+fnlpSyZa8=; b=HTn4QmE6185kW+q9CLp5I9LdwNrsSUCzuD u0OG1EawSy0b4mGdI367rHYKrO9pPx2MA4voLYoHPwRoo3MBsR60Ne9nlqRAD1Bn 0I6gAjAPXqUD54k0cN34wMht7J8yCXDa2qpWvOuiY1nsWCTpP+/caAEutHXIWpGj JtIqUw37s= Received: from localhost.localdomain (unknown [106.120.213.17]) by smtp14 (Coremail) with SMTP id EsCowADX5cr_FUVYUS2MEw--.10562S3; Mon, 05 Dec 2016 15:23:45 +0800 (CST) From: Pan Bian To: Jitendra Bhivare , Subbu Seetharaman , Ketan Mukadam , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Pan Bian Subject: [PATCH 1/2 v2] scsi: be2iscsi: set errno on error path Date: Mon, 5 Dec 2016 15:23:43 +0800 Message-Id: <1480922623-19261-1-git-send-email-bianpan2016@163.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: EsCowADX5cr_FUVYUS2MEw--.10562S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7GrW7Jr13Gw4DWF1fKFWDXFb_yoWkKwb_ur 4Iyr17W348tr4fC3WUtry3AF929rW8Xws7ur1agrySy34UZ3sxJr1rWr1rur45uw4xZF1U GwnrGr1FkwnrZjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUYD3vUUUUUU== X-Originating-IP: [106.120.213.17] X-CM-SenderInfo: held01tdqsiiqw6rljoofrz/1tbiQAE3clSIRS28GwAAsX Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Variable ret is reset in the loop, and its value will be 0 during the after repeat of the loop. Then, if pci_alloc_consistent() returns NULL, the return value is 0. 0 means no error, which may make it impossible for the callers of beiscsi_create_cqs() to detect the memory allocation error. This patch fixes the bug, assigning "-ENOMEM" to ret on the path that the call to pci_alloc_consistent() fails. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188941 Signed-off-by: Pan Bian --- drivers/scsi/be2iscsi/be_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index d9239c2..b6c5791 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -3113,8 +3113,10 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba, cq_vaddress = pci_alloc_consistent(phba->pcidev, num_cq_pages * PAGE_SIZE, &paddr); - if (!cq_vaddress) + if (!cq_vaddress) { + ret = -ENOMEM; goto create_cq_error; + } ret = be_fill_queue(cq, phba->params.num_cq_entries, sizeof(struct sol_cqe), cq_vaddress);