* [PATCH] scsi: acornscsi: Fix an error handling path in 'acornscsi_probe()'
@ 2020-05-30 8:16 Christophe JAILLET
2020-06-10 2:41 ` Martin K. Petersen
0 siblings, 1 reply; 2+ messages in thread
From: Christophe JAILLET @ 2020-05-30 8:16 UTC (permalink / raw)
To: linux, jejb, martin.petersen
Cc: Christophe JAILLET, kernel-janitors, linux-scsi,
linux-arm-kernel, linux-kernel
'ret' is known to be 0 at this point.
So, explicitly return -ENOMEM if one of the 'ecardm_iomap()' calls fail.
Fixes: e95a1b656a98 ("[ARM] rpc: acornscsi: update to new style ecard driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/scsi/arm/acornscsi.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index ddb52e7ba622..9a912fd0f70b 100644
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -2911,8 +2911,10 @@ static int acornscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
ashost->base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
ashost->fast = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
- if (!ashost->base || !ashost->fast)
+ if (!ashost->base || !ashost->fast) {
+ ret = -ENOMEM;
goto out_put;
+ }
host->irq = ec->irq;
ashost->host = host;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] scsi: acornscsi: Fix an error handling path in 'acornscsi_probe()'
2020-05-30 8:16 [PATCH] scsi: acornscsi: Fix an error handling path in 'acornscsi_probe()' Christophe JAILLET
@ 2020-06-10 2:41 ` Martin K. Petersen
0 siblings, 0 replies; 2+ messages in thread
From: Martin K. Petersen @ 2020-06-10 2:41 UTC (permalink / raw)
To: jejb, linux, Christophe JAILLET
Cc: linux-arm-kernel, kernel-janitors, linux-kernel,
Martin K . Petersen, linux-scsi
On Sat, 30 May 2020 10:16:22 +0200, Christophe JAILLET wrote:
> 'ret' is known to be 0 at this point.
> So, explicitly return -ENOMEM if one of the 'ecardm_iomap()' calls fail.
Applied to 5.8/scsi-queue, thanks!
[1/1] scsi: acornscsi: Fix an error handling path in acornscsi_probe()
https://git.kernel.org/mkp/scsi/c/7960c0b29626
--
Martin K. Petersen Oracle Linux Engineering
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-10 2:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-30 8:16 [PATCH] scsi: acornscsi: Fix an error handling path in 'acornscsi_probe()' Christophe JAILLET
2020-06-10 2:41 ` Martin K. Petersen
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).