From: root <root@localhost.localdomain>
Date: Wed, 2 May 2012 14:14:51 +0000 (+0530)
Subject: be2iscsi:Fix double free of MCCQ info memory.
X-Git-Tag: v2.6.39-400.9.0~423^2~52
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a5d1d421f29ad5796dd89519ee766e91c8066c96;p=users%2Fjedix%2Flinux-maple.git

be2iscsi:Fix double free of MCCQ info memory.

 In case of MCC_Q creation failed, the MCCQ info memory is freed
 from be_mcc_queues_destroy and be_mcc_queues_create. This caused
 kernel to panic because of double free.

 Signed-off-by: John Soni Jose <sony.john-n@emulex.com>
 Signed-off-by: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
 Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: root <root@localhost.(none)>
---

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 47a9e871feb6..9414dc741f26 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -2907,9 +2907,11 @@ beiscsi_post_pages(struct beiscsi_hba *phba)
 static void be_queue_free(struct beiscsi_hba *phba, struct be_queue_info *q)
 {
 	struct be_dma_mem *mem = &q->dma_mem;
-	if (mem->va)
+	if (mem->va) {
 		pci_free_consistent(phba->pcidev, mem->size,
 			mem->va, mem->dma);
+		mem->va = NULL;
+	}
 }
 
 static int be_queue_alloc(struct beiscsi_hba *phba, struct be_queue_info *q,