Commit 3c01b4f9 authored Jan 22, 2009 by Seokmann Ju Committed by James Bottomley Jan 25, 2009

[SCSI] qla2xxx: Add checks for a valid fcport in dev-loss-tmo/terminate_rport_io callbacks.



Commit f78badb1 ([SCSI] fc
transport: pre-emptively terminate i/o upon dev_loss_tmo timeout)
changed the callback semantics of dev_loss_tmo and
terminate_rport_io such that repeated calls could be made.  This
could result in the the driver using stale (NULLed-out, in
dev_loss_tmo) data from the rport.  Correct this by addint a
simple check to ensure a valid fcport is attached.

Signed-off-by: Seokmann Ju <seokmann.ju@qlogic.com>
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent 53303c42

drivers/scsi/qla2xxx/qla_attr.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -1016,6 +1016,9 @@ qla2x00_dev_loss_tmo_callbk(struct fc_rport *rport)
		struct Scsi_Host *host = rport_to_shost(rport);
		fc_port_t fcport = (fc_port_t **)rport->dd_data;

		if (!fcport)
		return;

		qla2x00_abort_fcport_cmds(fcport);

		/*
		@@ -1033,6 +1036,9 @@ qla2x00_terminate_rport_io(struct fc_rport *rport)
		{
		fc_port_t fcport = (fc_port_t **)rport->dd_data;

		if (!fcport)
		return;

		/*
		* At this point all fcport's software-states are cleared. Perform any
		* final cleanup of firmware resources (PCBs and XCBs).

Admin message