raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-08 10:59:46 +00:00
Code Issues Projects Releases Wiki Activity

scsi: pm80xx: Fix memory leak during rmmod

Browse Source 
[ Upstream commit 51e6ed83bb ]

Driver failed to release all memory allocated. This would lead to memory
leak during driver removal.

Properly free memory when the module is removed.

Link: https://lore.kernel.org/r/20210906170404.5682-5-Ajish.Koshy@microchip.com
Acked-by: Jack Wang <jinpu.wang@ionos.com>
Signed-off-by: Ajish Koshy <Ajish.Koshy@microchip.com>
Signed-off-by: Viswas G <Viswas.G@microchip.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ajish Koshy
2021-09-06 22:34:04 +05:30
committed by Greg Kroah-Hartman
parent a070e30d1b
commit 269a4311b1
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/scsi/pm8001/pm8001_init.c
View File

@@ -1198,6 +1198,7 @@ pm8001_init_ccb_tag(struct pm8001_hba_info *pm8001_ha, struct Scsi_Host *shost,
goto err_out; goto err_out;
/* Memory region for ccb_info*/ /* Memory region for ccb_info*/
pm8001_ha->ccb_count = ccb_count;
pm8001_ha->ccb_info = pm8001_ha->ccb_info =
kcalloc(ccb_count, sizeof(struct pm8001_ccb_info), GFP_KERNEL); kcalloc(ccb_count, sizeof(struct pm8001_ccb_info), GFP_KERNEL);
if (!pm8001_ha->ccb_info) { if (!pm8001_ha->ccb_info) {
@@ -1259,6 +1260,16 @@ static void pm8001_pci_remove(struct pci_dev *pdev)
tasklet_kill(&pm8001_ha->tasklet[j]); tasklet_kill(&pm8001_ha->tasklet[j]);
#endif #endif
scsi_host_put(pm8001_ha->shost); scsi_host_put(pm8001_ha->shost);
for (i = 0; i < pm8001_ha->ccb_count; i++) {
dma_free_coherent(&pm8001_ha->pdev->dev,
sizeof(struct pm8001_prd) * PM8001_MAX_DMA_SG,
pm8001_ha->ccb_info[i].buf_prd,
pm8001_ha->ccb_info[i].ccb_dma_handle);
}
kfree(pm8001_ha->ccb_info);
kfree(pm8001_ha->devices);
pm8001_free(pm8001_ha); pm8001_free(pm8001_ha);
kfree(sha->sas_phy); kfree(sha->sas_phy);
kfree(sha->sas_port); kfree(sha->sas_port);

1
drivers/scsi/pm8001/pm8001_sas.h
View File

@@ -517,6 +517,7 @@ struct pm8001_hba_info {
u32 iomb_size; /* SPC and SPCV IOMB size */ u32 iomb_size; /* SPC and SPCV IOMB size */
struct pm8001_device *devices; struct pm8001_device *devices;
struct pm8001_ccb_info *ccb_info; struct pm8001_ccb_info *ccb_info;
u32 ccb_count;
#ifdef PM8001_USE_MSIX #ifdef PM8001_USE_MSIX
int number_of_intr;/*will be used in remove()*/ int number_of_intr;/*will be used in remove()*/
char intr_drvname[PM8001_MAX_MSIX_VEC] char intr_drvname[PM8001_MAX_MSIX_VEC]