releases/3.0.1/libsas-remove-expander-from-dev-list-on-error.patch

   1 From 5911e963d3718e306bcac387b83e259aa4228896 Mon Sep 17 00:00:00 2001
   2 From: Luben Tuikov <ltuikov@yahoo.com>
   3 Date: Tue, 26 Jul 2011 23:10:48 -0700
   4 Subject: [SCSI] libsas: remove expander from dev list on error
   5
   6 From: Luben Tuikov <ltuikov@yahoo.com>
   7
   8 commit 5911e963d3718e306bcac387b83e259aa4228896 upstream.
   9
  10 If expander discovery fails (sas_discover_expander()), remove the
  11 expander from the port device list (sas_ex_discover_expander()),
  12 before freeing it. Else the list is corrupted and, e.g., when we
  13 attempt to send SMP commands to other devices, the kernel oopses.
  14
  15 Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
  16 Reviewed-by: Jack Wang <jack_wang@usish.com>
  17 Signed-off-by: James Bottomley <JBottomley@Parallels.com>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  19
  20 ---
  21  drivers/scsi/libsas/sas_expander.c |    3 +++
  22  1 file changed, 3 insertions(+)
  23
  24 --- a/drivers/scsi/libsas/sas_expander.c
  25 +++ b/drivers/scsi/libsas/sas_expander.c
  26 @@ -849,6 +849,9 @@ static struct domain_device *sas_ex_disc
  27
  28         res = sas_discover_expander(child);
  29         if (res) {
  30 +               spin_lock_irq(&parent->port->dev_list_lock);
  31 +               list_del(&child->dev_list_node);
  32 +               spin_unlock_irq(&parent->port->dev_list_lock);
  33                 kfree(child);
  34                 return NULL;
  35         }