Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751802AbcLEHYn (ORCPT ); Mon, 5 Dec 2016 02:24:43 -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 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-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1193 Lines: 33 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); -- 1.9.1