be2iscsi: fix dma free size mismatch regression

 Upstream kernel commit details are below.

 commit b83d543fd934d565fb243ef348b06a61d794b31d
 Author: Mike Christie <michaelc@cs.wisc.edu>
 Date:   Wed May 23 20:40:54 2012 -0500

 [SCSI] be2iscsi: fix dma free size mismatch regression

 This patch should go into 3.5 fixes. The bug was added in the
 patches for the 3.5 feature window.

 As you can see from the patch I made a mistake. During
 development I switched from passing a struct to the size of
 the struct, but left the sizeof. This results in us allocating
 4 bytes (sizeof(int)) but then calling pci_free_consistent
 with the size of the struct.

 Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
 Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: John Soni Jose <sony.john-n@emulex.com>
Signed-off-by: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>

diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c
index e6cb10d2e74e96d4957c391560657c511f724232..4e6d4eb312fe35fc8e881919fd291ba32df0527d 100644 (file)
--- a/drivers/scsi/be2iscsi/be_mgmt.c
+++ b/drivers/scsi/be2iscsi/be_mgmt.c
@@ -571,8 +571,7 @@ free_cmd:
 static int mgmt_alloc_cmd_data(struct beiscsi_hba *phba, struct be_dma_mem *cmd,
                               int iscsi_cmd, int size)
 {
-       cmd->va = pci_alloc_consistent(phba->ctrl.pdev, sizeof(size),
-                                      &cmd->dma);
+       cmd->va = pci_alloc_consistent(phba->ctrl.pdev, size, &cmd->dma);
        if (!cmd->va) {
                SE_DEBUG(DBG_LVL_1, "Failed to allocate memory for if info\n");
                return -ENOMEM;