From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20120205220950.812864962@pcw.home.local> Date: Sun, 05 Feb 2012 23:10:21 +0100 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Luben Tuikov , James Bottomley , Greg KH Subject: [PATCH 32/91] libsas: remove expander from dev list on error In-Reply-To: <0635750f5f06ed2ca212b91fcb5c4483@local> Sender: linux-kernel-owner@vger.kernel.org List-ID: 2.6.27-longterm review patch. If anyone has any objections, please let us know. ------------------ 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 Reviewed-by: Jack Wang Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/libsas/sas_expander.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) Index: longterm-2.6.27/drivers/scsi/libsas/sas_expander.c =================================================================== --- longterm-2.6.27.orig/drivers/scsi/libsas/sas_expander.c 2012-02-05 22:34:34.059914940 +0100 +++ longterm-2.6.27/drivers/scsi/libsas/sas_expander.c 2012-02-05 22:34:39.404915902 +0100 @@ -839,6 +839,9 @@ 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; }