scsi: be2iscsi: Revert "Fix a theoretical leak in beiscsi_create_eqs()" (eeaf06af) · Commits · 戴 / test

My patch caused kernel Oopses and delays in boot. Revert it. The problem was that I moved the "mem->dma = paddr;" before the call to be_fill_queue(). But the first thing that the be_fill_queue() function does is memset the whole struct to zero which overwrites the assignment. Link: https://lore.kernel.org/r/X8jXkt6eThjyVP1v@mwanda Fixes: ("scsi: be2iscsi: Fix a theoretical leak in beiscsi_create_eqs()") Cc: stable <stable@vger.kernel.org> Reported-by:

Thomas Lamprecht <t.lamprecht@proxmox.com> Signed-off-by:

Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by:

Martin K. Petersen <martin.petersen@oracle.com>

drivers/scsi/be2iscsi/be_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3020,7 +3020,6 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,
		goto create_eq_error;
		}

		mem->dma = paddr;
		mem->va = eq_vaddress;
		ret = be_fill_queue(eq, phba->params.num_eq_entries,
		sizeof(struct be_eq_entry), eq_vaddress);
		@@ -3030,6 +3029,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,
		goto create_eq_error;
		}

		mem->dma = paddr;
		ret = beiscsi_cmd_eq_create(&phba->ctrl, eq,
		BEISCSI_EQ_DELAY_DEF);
		if (ret) {
		@@ -3086,7 +3086,6 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,
		goto create_cq_error;
		}

		mem->dma = paddr;
		ret = be_fill_queue(cq, phba->params.num_cq_entries,
		sizeof(struct sol_cqe), cq_vaddress);
		if (ret) {
		@@ -3096,6 +3095,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,
		goto create_cq_error;
		}

		mem->dma = paddr;
		ret = beiscsi_cmd_cq_create(&phba->ctrl, cq, eq, false,
		false, 0);
		if (ret) {

Admin message