Skip to content

Commit

Permalink
scsi: fc: check for rport presence in fc_block_scsi_eh
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Thumshirn authored and martinkpetersen committed Oct 11, 2017
1 parent a9e170e commit 8d30371
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/scsi/scsi_transport_fc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 8d30371

Please sign in to comment.