diff options
| author | Luben Tuikov <ltuikov@yahoo.com> | 2011-07-27 08:10:48 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-07-27 13:50:58 +0200 |
| commit | 5911e963d3718e306bcac387b83e259aa4228896 (patch) | |
| tree | 1987f9c2d92087cf3ca2dbefb3724da6f3977864 /drivers/scsi/libsas | |
| parent | [SCSI] megaraid_sas Version to 5.40-rc1 and Changelog update (diff) | |
| download | linux-5911e963d3718e306bcac387b83e259aa4228896.tar.xz linux-5911e963d3718e306bcac387b83e259aa4228896.zip | |
[SCSI] libsas: remove expander from dev list on error
If expander discovery fails (sas_discover_expander()), remove the
expander from the port device list (sas_ex_discover_expander()),
before freeing it. Else the list is corrupted and, e.g., when we
attempt to send SMP commands to other devices, the kernel oopses.
Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Cc: stable@kernel.org
Reviewed-by: Jack Wang <jack_wang@usish.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/libsas')
| -rw-r--r-- | drivers/scsi/libsas/sas_expander.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index 874e29d9533f..f84084bba2f0 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -849,6 +849,9 @@ static struct domain_device *sas_ex_discover_expander( res = sas_discover_expander(child); if (res) { + spin_lock_irq(&parent->port->dev_list_lock); + list_del(&child->dev_list_node); + spin_unlock_irq(&parent->port->dev_list_lock); kfree(child); return NULL; } |