Unverified Commit 96697ce8 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6442 scsi: pm80xx: Fix memory leak during rmmod 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Lingfeng <lilingfeng3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/4AP4M2OCGWNQODHLQCK4XEM4YUGJPJQT/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9FNET 
 
Link:https://gitee.com/openeuler/kernel/pulls/6442

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 37c170e0 ba5de05b

drivers/scsi/pm8001/pm8001_init.c

+11 −0
Original line number Diff line number Diff line
@@ -1166,6 +1166,7 @@ pm8001_init_ccb_tag(struct pm8001_hba_info *pm8001_ha, struct Scsi_Host *shost, 
		goto err_out;



	/* Memory region for ccb_info*/

	pm8001_ha->ccb_count = ccb_count;

	pm8001_ha->ccb_info = (struct pm8001_ccb_info *)

		kcalloc(ccb_count, sizeof(struct pm8001_ccb_info), GFP_KERNEL);

	if (!pm8001_ha->ccb_info) {
@@ -1226,6 +1227,16 @@ static void pm8001_pci_remove(struct pci_dev *pdev) 
			tasklet_kill(&pm8001_ha->tasklet[j]);

#endif

	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);

	kfree(sha->sas_phy);

	kfree(sha->sas_port);

drivers/scsi/pm8001/pm8001_sas.h

+1 −0
Original line number Diff line number Diff line
@@ -515,6 +515,7 @@ struct pm8001_hba_info { 
	u32			iomb_size; /* SPC and SPCV IOMB size */

	struct pm8001_device	*devices;

	struct pm8001_ccb_info	*ccb_info;

	u32			ccb_count;

#ifdef PM8001_USE_MSIX

	int			number_of_intr;/*will be used in remove()*/

	char			intr_drvname[PM8001_MAX_MSIX_VEC]