diff options
| author |   Jiri Slaby <jslaby@suse.cz> | 2010-06-22 13:42:02 +0200 |
|---|---|---|
| committer |   James Bottomley <James.Bottomley@suse.de> | 2010-07-27 12:03:53 -0500 |
| commit | 24ae163ed33d2b8a70d2f0b1947b401d0a8e8719 (patch) | |
| tree | 122060af30c9072a936e5fb86ebf5a617b522fe8 /drivers/scsi/mvsas | |
| parent | [SCSI] mptfusion: print Doorbell register in a case of hard reset and timeout (diff) | |
| download | linux-dev-24ae163ed33d2b8a70d2f0b1947b401d0a8e8719.tar.xz linux-dev-24ae163ed33d2b8a70d2f0b1947b401d0a8e8719.zip | |
[SCSI] mvsas: fix potential NULL dereference
Stanse found that in mvs_abort_task, mvi_dev is dereferenced earlier
than tested for being NULL. Move the assignment below the test.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/mvsas')
| -rw-r--r-- | drivers/scsi/mvsas/mv_sas.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c index f5e321791903..cab924239862 100644 --- a/drivers/scsi/mvsas/mv_sas.c +++ b/drivers/scsi/mvsas/mv_sas.c @@ -1640,7 +1640,7 @@ int mvs_abort_task(struct sas_task *task) struct mvs_tmf_task tmf_task; struct domain_device *dev = task->dev; struct mvs_device *mvi_dev = (struct mvs_device *)dev->lldd_dev; - struct mvs_info *mvi = mvi_dev->mvi_info; + struct mvs_info *mvi; int rc = TMF_RESP_FUNC_FAILED; unsigned long flags; u32 tag; @@ -1650,6 +1650,8 @@ int mvs_abort_task(struct sas_task *task) rc = TMF_RESP_FUNC_FAILED; } + mvi = mvi_dev->mvi_info; + spin_lock_irqsave(&task->task_state_lock, flags); if (task->task_state_flags & SAS_TASK_STATE_DONE) { spin_unlock_irqrestore(&task->task_state_lock, flags); |