commit 541950027f8b7c96a639bc16e48930c590f1b98a
author Alan Stern <stern@rowland.harvard.edu> Thu Sep 15 21:52:51 2005 -0400
committer James Bottomley <jejb@mulgrave.(none)> Thu Sep 15 22:03:54 2005 -0400
tree 69d367dab3f738c888bf16646ed85cde69e3bf2a
parent b5683557331b129658ab435391df527ef72d63dc

[SCSI] fix use after potential free in scsi_remove_device

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

drivers/scsi/scsi_sysfs.c

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index b8052d5..83f87c4 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -707,9 +707,11 @@
  **/
 void scsi_remove_device(struct scsi_device *sdev)
 {
-	down(&sdev->host->scan_mutex);
+	struct Scsi_Host *shost = sdev->host;
+
+	down(&shost->scan_mutex);
 	__scsi_remove_device(sdev);
-	up(&sdev->host->scan_mutex);
+	up(&shost->scan_mutex);
 }
 EXPORT_SYMBOL(scsi_remove_device);