From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Mon, 7 Jan 2008 22:59:05 +0000 (+0900)
Subject: [SCSI] fix scsi_setup_command_freelist failure path race
X-Git-Tag: v2.6.25-rc1~1230^2~75
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=166a72878f76e911f2d1ce4b2310d4403e94be11;p=~emulex%2Finfiniband.git

[SCSI] fix scsi_setup_command_freelist failure path race

Looks like that host_cmd_pool_mutex are necessary here.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index ebc01938083..54ff611b867 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -319,17 +319,16 @@ int scsi_setup_command_freelist(struct Scsi_Host *shost)
 			GFP_KERNEL | shost->cmd_pool->gfp_mask);
 	if (!cmd)
 		goto fail2;
-	list_add(&cmd->list, &shost->free_list);		
+	list_add(&cmd->list, &shost->free_list);
 	return 0;
 
  fail2:
+	mutex_lock(&host_cmd_pool_mutex);
 	if (!--pool->users)
 		kmem_cache_destroy(pool->slab);
-	return -ENOMEM;
  fail:
 	mutex_unlock(&host_cmd_pool_mutex);
 	return -ENOMEM;
-
 }
 
 /**