Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b83d543f authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[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: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 356293bc

drivers/scsi/be2iscsi/be_mgmt.c

+2 −3
Original line number Diff line number Diff line
@@ -571,13 +571,12 @@ static int mgmt_exec_nonemb_cmd(struct beiscsi_hba *phba, 
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;

	}

	memset(cmd->va, 0, sizeof(size));

	memset(cmd->va, 0, size);

	cmd->size = size;

	be_cmd_hdr_prepare(cmd->va, CMD_SUBSYSTEM_ISCSI, iscsi_cmd, size);

	return 0;