lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Robert Love <robert.w.love@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Robert Love
2010-11-30 16:18:23 -08:00
committed by James Bottomley
parent 2034c19ce8
commit 3c2c3bf23c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/libfc/fc_fcp.c
View File

@@ -2004,7 +2004,7 @@ int fc_eh_abort(struct scsi_cmnd *sc_cmd)
fsp = CMD_SP(sc_cmd); fsp = CMD_SP(sc_cmd);
if (!fsp) { if (!fsp) {
/* command completed while scsi eh was setting up */ /* 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; return SUCCESS;
} }
/* grab a ref so the fsp and sc_cmd cannot be relased from under us */ /* grab a ref so the fsp and sc_cmd cannot be relased from under us */