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

Commit 787982f1 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

scsi: be2iscsi: Fix a theoretical leak in beiscsi_create_eqs() 

[ Upstream commit 38b2db564d9ab7797192ef15d7aade30633ceeae ]

The be_fill_queue() function can only fail when "eq_vaddress" is NULL and
since it's non-NULL here that means the function call can't fail.  But
imagine if it could, then in that situation we would want to store the
"paddr" so that dma memory can be released.

Link: https://lore.kernel.org/r/20200928091300.GD377727@mwanda


Fixes: bfead3b2 ("[SCSI] be2iscsi: Adding msix and mcc_rings V3")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 052daa60

drivers/scsi/be2iscsi/be_main.c

+2 −2
Original line number Diff line number Diff line
@@ -3039,6 +3039,7 @@ 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);
@@ -3048,7 +3049,6 @@ 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) {
@@ -3105,6 +3105,7 @@ 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) {
@@ -3114,7 +3115,6 @@ 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) {