aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPan Bian <bianpan2016@163.com>2016-12-04 00:23:04 -0500
committerMartin K. Petersen <martin.petersen@oracle.com>2016-12-05 17:23:05 -0500
commit84a261ff76544a7968e184eac4213b24e8bbd81a (patch)
treebcc1a5eb292072366fd74a3d492b4c7e2d8e09aa
parent29b33252751b430e400a987667a826ffcd2741f4 (diff)
scsi: be2iscsi: set errno on error path
Variable ret is reset in the loop, and its value will be 0 during the second and after repeat of the loop. If pci_alloc_consistent() returns a NULL pointer then, it will leaves with return value 0. 0 means no error, which is contrary to the fact. This patches fixes the bug, explicitly assigning "-ENOMEM" to return variable ret on the path that the call to pci_alloc_consistent() fails. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188951 Signed-off-by: Pan Bian <bianpan2016@163.com> Reviewed-by: Jitendra Bhivare <Jitendra.bhivare@broadcom.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r--drivers/scsi/be2iscsi/be_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index b6c5791060e5..b5112d6d7e73 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -3049,8 +3049,10 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,
3049 eq_vaddress = pci_alloc_consistent(phba->pcidev, 3049 eq_vaddress = pci_alloc_consistent(phba->pcidev,
3050 num_eq_pages * PAGE_SIZE, 3050 num_eq_pages * PAGE_SIZE,
3051 &paddr); 3051 &paddr);
3052 if (!eq_vaddress) 3052 if (!eq_vaddress) {
3053 ret = -ENOMEM;
3053 goto create_eq_error; 3054 goto create_eq_error;
3055 }
3054 3056
3055 mem->va = eq_vaddress; 3057 mem->va = eq_vaddress;
3056 ret = be_fill_queue(eq, phba->params.num_eq_entries, 3058 ret = be_fill_queue(eq, phba->params.num_eq_entries,