* [PATCH 2/2] scsi: be2iscsi: set errno on error path
@ 2016-12-04 5:23 Pan Bian
2016-12-05 3:29 ` Jitendra Bhivare
0 siblings, 1 reply; 2+ messages in thread
From: Pan Bian @ 2016-12-04 5:23 UTC (permalink / raw)
To: Subbu Seetharaman, Ketan Mukadam, Jitendra Bhivare,
James E.J. Bottomley, Martin K. Petersen, linux-scsi
Cc: linux-kernel, Pan Bian
From: Pan Bian <bianpan2016@163.com>
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>
---
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 b6c5791..b5112d6 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,
eq_vaddress = pci_alloc_consistent(phba->pcidev,
num_eq_pages * PAGE_SIZE,
&paddr);
- if (!eq_vaddress)
+ if (!eq_vaddress) {
+ ret = -ENOMEM;
goto create_eq_error;
+ }
mem->va = eq_vaddress;
ret = be_fill_queue(eq, phba->params.num_eq_entries,
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* RE: [PATCH 2/2] scsi: be2iscsi: set errno on error path
2016-12-04 5:23 [PATCH 2/2] scsi: be2iscsi: set errno on error path Pan Bian
@ 2016-12-05 3:29 ` Jitendra Bhivare
0 siblings, 0 replies; 2+ messages in thread
From: Jitendra Bhivare @ 2016-12-05 3:29 UTC (permalink / raw)
To: Pan Bian, Subramanian Seetharaman, Ketan Mukadam,
James E.J. Bottomley, Martin K. Petersen, linux-scsi
Cc: linux-kernel, Pan Bian
> -----Original Message-----
> From: Pan Bian [mailto:bianpan201603@163.com]
> Sent: Sunday, December 04, 2016 10:53 AM
> To: Subbu Seetharaman; Ketan Mukadam; Jitendra Bhivare; James E.J.
> Bottomley; Martin K. Petersen; linux-scsi@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org; Pan Bian
> Subject: [PATCH 2/2] scsi: be2iscsi: set errno on error path
>
> From: Pan Bian <bianpan2016@163.com>
>
> 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>
> ---
> 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 b6c5791..b5112d6 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,
> eq_vaddress = pci_alloc_consistent(phba->pcidev,
> num_eq_pages *
PAGE_SIZE,
> &paddr);
> - if (!eq_vaddress)
> + if (!eq_vaddress) {
> + ret = -ENOMEM;
> goto create_eq_error;
> + }
>
> mem->va = eq_vaddress;
> ret = be_fill_queue(eq, phba->params.num_eq_entries,
> --
> 1.9.1
>
[JB] Thanks.
Reviewed-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-12-05 3:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-04 5:23 [PATCH 2/2] scsi: be2iscsi: set errno on error path Pan Bian
2016-12-05 3:29 ` Jitendra Bhivare
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).