| From 3ab5dda417039b8caa498b11cf7bd6817d9f1756 Mon Sep 17 00:00:00 2001 |
| From: Luben Tuikov <ltuikov@yahoo.com> |
| Date: Tue, 26 Jul 2011 23:10:48 -0700 |
| Subject: [PATCH] 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| drivers/scsi/libsas/sas_expander.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c |
| index c65af02..fbf0a09 100644 |
| --- a/drivers/scsi/libsas/sas_expander.c |
| +++ b/drivers/scsi/libsas/sas_expander.c |
| @@ -841,6 +841,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; |
| } |
| -- |
| 1.7.9.6 |
| |
