[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1480922623-19261-1-git-send-email-bianpan2016@163.com>
Date: Mon, 5 Dec 2016 15:23:43 +0800
From: Pan Bian <bianpan2016@....com>
To: Jitendra Bhivare <jitendra.bhivare@...adcom.com>,
Subbu Seetharaman <subbu.seetharaman@...adcom.com>,
Ketan Mukadam <ketan.mukadam@...adcom.com>,
"James E.J. Bottomley" <jejb@...ux.vnet.ibm.com>,
"Martin K. Petersen" <martin.petersen@...cle.com>,
linux-scsi@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, Pan Bian <bianpan2016@....com>
Subject: [PATCH 1/2 v2] scsi: be2iscsi: set errno on error path
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 <bianpan2016@....com>
---
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
Powered by blists - more mailing lists