Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c2c3bf2 authored by Robert Love's avatar Robert Love Committed by James Bottomley
Browse files

[SCSI] libfc: Fix incorrect locking and unlocking in FCP 



The error handler grabs the si->scsi_queue_lock, but
in the case where the fsp pointer is NULL it releases
the scsi_host lock. This can lead to a variety of
system hangs depending on which is used first- the
scsi_host lock or the scsi_queue_lock.

This patch simply unlocks the correct lock when fcp
is NULL.

Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Tested-by: default avatarRoss Brattain <ross.b.brattain@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 2034c19c

drivers/scsi/libfc/fc_fcp.c

+1 −1
Original line number Diff line number Diff line
@@ -2004,7 +2004,7 @@ int fc_eh_abort(struct scsi_cmnd *sc_cmd) 
	fsp = CMD_SP(sc_cmd);

	if (!fsp) {

		/* command completed while scsi eh was setting up */

		spin_unlock_irqrestore(lport->host->host_lock, flags);

		spin_unlock_irqrestore(&si->scsi_queue_lock, flags);

		return SUCCESS;

	}

	/* grab a ref so the fsp and sc_cmd cannot be relased from under us */