diff options
| author | James Bottomley <James.Bottomley@suse.de> | 2010-05-13 09:31:54 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-05-16 15:34:58 -0400 |
| commit | 1b4d0d8ea7b3cbd107f345ab766416f9b38ce66a (patch) | |
| tree | a5aeda206eb92e702ad7e9b9e2b91e50fa6964d2 /drivers/scsi/libsas/sas_ata.c | |
| parent | b5dbc858717113c823fe6bb058807c2cb67d1efa (diff) | |
| download | kernel_samsung_smdk4412-1b4d0d8ea7b3cbd107f345ab766416f9b38ce66a.zip kernel_samsung_smdk4412-1b4d0d8ea7b3cbd107f345ab766416f9b38ce66a.tar.gz kernel_samsung_smdk4412-1b4d0d8ea7b3cbd107f345ab766416f9b38ce66a.tar.bz2 | |
[SCSI] libsas: fix deref before check in commit 70b25f890ce
commit 70b25f890ce9f0520c64075ce9225a5b020a513e
Author: Tejun Heo <tj@kernel.org>
Date: Thu Apr 15 09:00:08 2010 +0900
[SCSI] fix locking around blk_abort_request()
Introduced a reference before check problem, fix this by moving the
lock shorthand code to be right at the point of actual use.
Reported-by: Dan Carpenter <error27@gmail.com>
Acked-by: Tejun Heo <tj@kernel.org>
Cc: Stable Tree <stable@kernel.org>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/libsas/sas_ata.c')
| -rw-r--r-- | drivers/scsi/libsas/sas_ata.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index 88f7446..8c496b5 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c @@ -395,12 +395,13 @@ int sas_ata_init_host_and_port(struct domain_device *found_dev, void sas_ata_task_abort(struct sas_task *task) { struct ata_queued_cmd *qc = task->uldd_task; - struct request_queue *q = qc->scsicmd->device->request_queue; struct completion *waiting; - unsigned long flags; /* Bounce SCSI-initiated commands to the SCSI EH */ if (qc->scsicmd) { + struct request_queue *q = qc->scsicmd->device->request_queue; + unsigned long flags; + spin_lock_irqsave(q->queue_lock, flags); blk_abort_request(qc->scsicmd->request); spin_unlock_irqrestore(q->queue_lock, flags); |