Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1739593

[PATCH v2 1/1] scsi: fc: check for rport presence in fc_block_scsi_eh

Show all headers | View raw

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>
---

Changes since v1:
- s/WARN_ON/WARN_ON_ONCE/ (Bart)

---
 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..38abff7b5dbc 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_ONCE(!rport))
+		return 0;
+
 	return fc_block_rport(rport);
 }
 EXPORT_SYMBOL(fc_block_scsi_eh);
-- 
2.13.5

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 1/1] scsi: fc: check for rport presence in fc_block_scsi_eh Johannes Thumshirn <jthumshirn@suse.de> - 2017-09-26 09:10 +0200
  Re: [PATCH v2 1/1] scsi: fc: check for rport presence in  fc_block_scsi_eh Hannes Reinecke <hare@suse.de> - 2017-09-26 09:30 +0200
  Re: [PATCH v2 1/1] scsi: fc: check for rport presence in  fc_block_scsi_eh Steffen Maier <maier@linux.vnet.ibm.com> - 2017-09-26 11:20 +0200

csiph-web