diff options
| author |   Johannes Thumshirn <jthumshirn@suse.de> | 2017-10-10 17:31:38 +0200 |
|---|---|---|
| committer |   Martin K. Petersen <martin.petersen@oracle.com> | 2017-10-11 14:33:12 -0400 |
| commit | 8d30371fd7c328e192d7ea3108bd71b903631d6a (patch) | |
| tree | 30ffbf1b9ca1df377a96f3a51d9a583f9f331f6d /drivers/scsi/scsi_transport_fc.c | |
| parent | scsi: qla2xxx: Fix uninitialized work element (diff) | |
| download | linux-dev-8d30371fd7c328e192d7ea3108bd71b903631d6a.tar.xz linux-dev-8d30371fd7c328e192d7ea3108bd71b903631d6a.zip | |
scsi: fc: check for rport presence in fc_block_scsi_eh
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>
Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/scsi_transport_fc.c')
| -rw-r--r-- | drivers/scsi/scsi_transport_fc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index cbd4495d0ff9..8c46a6d536af 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c @@ -3320,6 +3320,9 @@ int fc_block_scsi_eh(struct scsi_cmnd *cmnd) { struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device)); + if (WARN_ON_ONCE(!rport)) + return FAST_IO_FAIL; + return fc_block_rport(rport); } EXPORT_SYMBOL(fc_block_scsi_eh); |