* [PATCH] scsi: fc: check for rport presence in fc_block_scsi_eh
@ 2017-09-25 12:00 Johannes Thumshirn
2017-09-25 23:29 ` Bart Van Assche
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Thumshirn @ 2017-09-25 12:00 UTC (permalink / raw)
To: Martin K . Petersen
Cc: Linux SCSI Mailinglist, Linux Kernel Mailinglist,
Hannes Reinecke, Bart Van Assche, Christoph Hellwig,
Johannes Thumshirn
Coverity-scan recently found a possible NULL pointer dereference in
fc_block_scsi_eh() as starget_to_rport() either returns the rport for
the startget or NULL.
While it is rather unlikely to have fc_block_scsi_eh() called without
an rport associated it's a good idea to catch potential misuses of the
API gracefully.
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
drivers/scsi/scsi_transport_fc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index ba9d70f8a6a1..830ce53f30fb 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -3328,6 +3328,9 @@ int fc_block_scsi_eh(struct scsi_cmnd *cmnd)
{
struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device));
+ if (WARN_ON(!rport))
+ return 0;
+
return fc_block_rport(rport);
}
EXPORT_SYMBOL(fc_block_scsi_eh);
--
2.13.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] scsi: fc: check for rport presence in fc_block_scsi_eh
2017-09-25 12:00 [PATCH] scsi: fc: check for rport presence in fc_block_scsi_eh Johannes Thumshirn
@ 2017-09-25 23:29 ` Bart Van Assche
2017-09-26 6:55 ` Johannes Thumshirn
0 siblings, 1 reply; 3+ messages in thread
From: Bart Van Assche @ 2017-09-25 23:29 UTC (permalink / raw)
To: jthumshirn, martin.petersen
Cc: linux-scsi, linux-kernel, hch, hare, Bart Van Assche
On Mon, 2017-09-25 at 14:00 +0200, Johannes Thumshirn wrote:
> Coverity-scan recently found a possible NULL pointer dereference in
> fc_block_scsi_eh() as starget_to_rport() either returns the rport for
> the startget or NULL.
>
> While it is rather unlikely to have fc_block_scsi_eh() called without
> an rport associated it's a good idea to catch potential misuses of the
> API gracefully.
>
> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
> ---
> drivers/scsi/scsi_transport_fc.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
> index ba9d70f8a6a1..830ce53f30fb 100644
> --- a/drivers/scsi/scsi_transport_fc.c
> +++ b/drivers/scsi/scsi_transport_fc.c
> @@ -3328,6 +3328,9 @@ int fc_block_scsi_eh(struct scsi_cmnd *cmnd)
> {
> struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device));
>
> + if (WARN_ON(!rport))
> + return 0;
> +
> return fc_block_rport(rport);
> }
> EXPORT_SYMBOL(fc_block_scsi_eh);
Did you perhaps intend to use WARN_ON_ONCE() instead of WARN_ON()? Anyway:
Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] scsi: fc: check for rport presence in fc_block_scsi_eh
2017-09-25 23:29 ` Bart Van Assche
@ 2017-09-26 6:55 ` Johannes Thumshirn
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Thumshirn @ 2017-09-26 6:55 UTC (permalink / raw)
To: Bart Van Assche; +Cc: martin.petersen, linux-scsi, linux-kernel, hch, hare
On Mon, Sep 25, 2017 at 11:29:07PM +0000, Bart Van Assche wrote:
> Did you perhaps intend to use WARN_ON_ONCE() instead of WARN_ON()?
Now that you're saying it. I'll send a v2.
Thanks,
Johannes
--
Johannes Thumshirn Storage
jthumshirn@suse.de +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-09-26 6:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-25 12:00 [PATCH] scsi: fc: check for rport presence in fc_block_scsi_eh Johannes Thumshirn
2017-09-25 23:29 ` Bart Van Assche
2017-09-26 6:55 ` Johannes Thumshirn
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.