diff --git a/patches.suse/scsi-be2iscsi-fix-a-theoretical-leak-in-beiscsi_create_eqs b/patches.suse/scsi-be2iscsi-fix-a-theoretical-leak-in-beiscsi_create_eqs deleted file mode 100644 index fff3994..0000000 --- a/patches.suse/scsi-be2iscsi-fix-a-theoretical-leak-in-beiscsi_create_eqs +++ /dev/null @@ -1,58 +0,0 @@ -From: Dan Carpenter -Date: Mon, 28 Sep 2020 12:13:00 +0300 -Subject: scsi: be2iscsi: Fix a theoretical leak in beiscsi_create_eqs() -Git-commit: 38b2db564d9ab7797192ef15d7aade30633ceeae -Patch-mainline: v5.10-rc1 -References: jsc#SLE-15082 - -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: bfead3b2cb46 ("[SCSI] be2iscsi: Adding msix and mcc_rings V3") -Signed-off-by: Dan Carpenter -Signed-off-by: Martin K. Petersen -Acked-by: Lee Duncan ---- - drivers/scsi/be2iscsi/be_main.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c -index 8dc2e0824ad7..0e45f2c14559 100644 ---- a/drivers/scsi/be2iscsi/be_main.c -+++ b/drivers/scsi/be2iscsi/be_main.c -@@ -3020,6 +3020,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); -@@ -3029,7 +3030,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) { -@@ -3086,6 +3086,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) { -@@ -3095,7 +3096,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) { - diff --git a/series.conf b/series.conf index c06d2ae..492cc12 100644 --- a/series.conf +++ b/series.conf @@ -43233,7 +43233,6 @@ patches.suse/scsi-qla2xxx-Fix-inconsistent-format-argument-type-i-250bd009.patch patches.suse/scsi-qla2xxx-Fix-inconsistent-format-argument-type-i-72e813d9.patch patches.suse/scsi-aacraid-add-a-missing-iounmap-call - patches.suse/scsi-be2iscsi-fix-a-theoretical-leak-in-beiscsi_create_eqs patches.suse/scsi-lpfc-Drop-nodelist-reference-on-error-in-lpfc_g.patch patches.suse/scsi-lpfc-Remove-unneeded-variable-status-in-lpfc_fc.patch patches.suse/leds-mt6323-move-period-calculation.patch