This is a note to let you know that I've just added the patch titled
scsi: mpi3mr: Fix sas_hba.phy memory leak in mpi3mr_remove()
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
scsi-mpi3mr-fix-sas_hba.phy-memory-leak-in-mpi3mr_re.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit f482b5af2382f0f6973283a67557cba32fa0cd57
Author: Tomas Henzl <thenzl@xxxxxxxxxx>
Date: Fri Mar 3 00:43:34 2023 +0100
scsi: mpi3mr: Fix sas_hba.phy memory leak in mpi3mr_remove()
[ Upstream commit d4caa1a4255cc44be56bcab3db2c97c632e6cc10 ]
Free mrioc->sas_hba.phy at .remove.
Fixes: 42fc9fee116f ("scsi: mpi3mr: Add helper functions to manage device's port")
Signed-off-by: Tomas Henzl <thenzl@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230302234336.25456-5-thenzl@xxxxxxxxxx
Acked-by: Sathya Prakash Veerichetty <sathya.prakash@xxxxxxxxxxxx>
Signed-off-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c
index 5032b0b5186d4..5698e7b90f852 100644
--- a/drivers/scsi/mpi3mr/mpi3mr_os.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_os.c
@@ -5127,6 +5127,12 @@ static void mpi3mr_remove(struct pci_dev *pdev)
}
spin_unlock_irqrestore(&mrioc->sas_node_lock, flags);
+ if (mrioc->sas_hba.num_phys) {
+ kfree(mrioc->sas_hba.phy);
+ mrioc->sas_hba.phy = NULL;
+ mrioc->sas_hba.num_phys = 0;
+ }
+
spin_lock(&mrioc_list_lock);
list_del(&mrioc->list);
spin_unlock(&mrioc_list_lock);
