aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLuben Tuikov <ltuikov@yahoo.com>2011-07-26 23:10:48 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-08 10:23:10 -0700
commitda229078845ada4d7b0b49a020c8eaf49420cec9 (patch)
tree4a8411a9d006d448bcb431336a784c1df48b6da1 /drivers
parent3cd03745e7c9affa99ed9e0fe891c8aba887c9df (diff)
downloadlinux-linaro-stable-da229078845ada4d7b0b49a020c8eaf49420cec9.tar.gz
libsas: remove expander from dev list on error
commit 5911e963d3718e306bcac387b83e259aa4228896 upstream. 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> Reviewed-by: Jack Wang <jack_wang@usish.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/libsas/sas_expander.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index 33cf988c8c8a..4f43306e9214 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -840,6 +840,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;
}