diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2010-03-18 15:39:30 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-05-25 11:00:56 -0500 |
| commit | f9e8894ae5157796dd69249c56062042d02a431d (patch) | |
| tree | cfc0f34d22771525330b995a2f58655bdd5aaa04 /drivers/scsi | |
| parent | 8a52da632ceb9d8b776494563df579e87b7b586b (diff) | |
| download | op-kernel-dev-f9e8894ae5157796dd69249c56062042d02a431d.zip op-kernel-dev-f9e8894ae5157796dd69249c56062042d02a431d.tar.gz | |
[SCSI] fix race in scsi_target_reap
This patch (as1357) fixes a race in SCSI target allocation and
release. Putting a target in the STARGET_DEL state isn't protected by
the host lock, so an old target structure could be reused by a new
device even though it's about to be deleted. The cure is to change
the state while still holding the host lock.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi_scan.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index c992ecf..a77468c 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -492,19 +492,20 @@ void scsi_target_reap(struct scsi_target *starget) struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); unsigned long flags; enum scsi_target_state state; - int empty; + int empty = 0; spin_lock_irqsave(shost->host_lock, flags); state = starget->state; - empty = --starget->reap_ref == 0 && - list_empty(&starget->devices) ? 1 : 0; + if (--starget->reap_ref == 0 && list_empty(&starget->devices)) { + empty = 1; + starget->state = STARGET_DEL; + } spin_unlock_irqrestore(shost->host_lock, flags); if (!empty) return; BUG_ON(state == STARGET_DEL); - starget->state = STARGET_DEL; if (state == STARGET_CREATED) scsi_target_destroy(starget); else |
