projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f28bdab
)
scsi: mpi3mr: Fix sas_hba.phy memory leak in mpi3mr_remove()
author
Tomas Henzl
<thenzl@redhat.com>
Thu, 2 Mar 2023 23:43:34 +0000
(
00:43
+0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 22 Mar 2023 12:33:41 +0000
(13:33 +0100)
[ 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@redhat.com>
Link:
https://lore.kernel.org/r/20230302234336.25456-5-thenzl@redhat.com
Acked-by: Sathya Prakash Veerichetty <sathya.prakash@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/scsi/mpi3mr/mpi3mr_os.c
patch
|
blob
|
history
diff --git
a/drivers/scsi/mpi3mr/mpi3mr_os.c
b/drivers/scsi/mpi3mr/mpi3mr_os.c
index
5032b0b
..
5698e7b
100644
(file)
--- 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);