Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd06518d authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/pp: Fix memory leak in error path in smumgr 



Free the backend structure if we fail to allocate device memory.

Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 116af450

drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c

+20 −12
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ static int cz_smu_init(struct pp_hwmgr *hwmgr) 
				&cz_smu->toc_buffer.mc_addr,

				&cz_smu->toc_buffer.kaddr);

	if (ret)

		return -EINVAL;

		goto err2;



	ret = amdgpu_bo_create_kernel((struct amdgpu_device *)hwmgr->adev,

				cz_smu->smu_buffer.data_size,
@@ -773,19 +773,15 @@ static int cz_smu_init(struct pp_hwmgr *hwmgr) 
				&cz_smu->smu_buffer.handle,

				&cz_smu->smu_buffer.mc_addr,

				&cz_smu->smu_buffer.kaddr);

	if (ret) {

		amdgpu_bo_free_kernel(&cz_smu->toc_buffer.handle,

					&cz_smu->toc_buffer.mc_addr,

					&cz_smu->toc_buffer.kaddr);

		return -EINVAL;

	}

	if (ret)

		goto err1;



	if (0 != cz_smu_populate_single_scratch_entry(hwmgr,

		CZ_SCRATCH_ENTRY_UCODE_ID_RLC_SCRATCH,

		UCODE_ID_RLC_SCRATCH_SIZE_BYTE,

		&cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) {

		pr_err("Error when Populate Firmware Entry.\n");

		return -1;

		goto err0;

	}



	if (0 != cz_smu_populate_single_scratch_entry(hwmgr,
@@ -793,14 +789,14 @@ static int cz_smu_init(struct pp_hwmgr *hwmgr) 
		UCODE_ID_RLC_SRM_ARAM_SIZE_BYTE,

		&cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) {

		pr_err("Error when Populate Firmware Entry.\n");

		return -1;

		goto err0;

	}

	if (0 != cz_smu_populate_single_scratch_entry(hwmgr,

		CZ_SCRATCH_ENTRY_UCODE_ID_RLC_SRM_DRAM,

		UCODE_ID_RLC_SRM_DRAM_SIZE_BYTE,

		&cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) {

		pr_err("Error when Populate Firmware Entry.\n");

		return -1;

		goto err0;

	}



	if (0 != cz_smu_populate_single_scratch_entry(hwmgr,
@@ -808,7 +804,7 @@ static int cz_smu_init(struct pp_hwmgr *hwmgr) 
		sizeof(struct SMU8_MultimediaPowerLogData),

		&cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) {

		pr_err("Error when Populate Firmware Entry.\n");

		return -1;

		goto err0;

	}



	if (0 != cz_smu_populate_single_scratch_entry(hwmgr,
@@ -816,10 +812,22 @@ static int cz_smu_init(struct pp_hwmgr *hwmgr) 
		sizeof(struct SMU8_Fusion_ClkTable),

		&cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) {

		pr_err("Error when Populate Firmware Entry.\n");

		return -1;

		goto err0;

	}



	return 0;



err0:

	amdgpu_bo_free_kernel(&cz_smu->smu_buffer.handle,

				&cz_smu->smu_buffer.mc_addr,

				&cz_smu->smu_buffer.kaddr);

err1:

	amdgpu_bo_free_kernel(&cz_smu->toc_buffer.handle,

				&cz_smu->toc_buffer.mc_addr,

				&cz_smu->toc_buffer.kaddr);

err2:

	kfree(cz_smu);

	return -EINVAL;

}



static int cz_smu_fini(struct pp_hwmgr *hwmgr)

drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c

+3 −1
Original line number Diff line number Diff line
@@ -354,8 +354,10 @@ static int fiji_smu_init(struct pp_hwmgr *hwmgr) 


	hwmgr->smu_backend = fiji_priv;



	if (smu7_init(hwmgr))

	if (smu7_init(hwmgr)) {

		kfree(fiji_priv);

		return -EINVAL;

	}



	return 0;

}

drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c

+3 −1
Original line number Diff line number Diff line
@@ -271,8 +271,10 @@ static int iceland_smu_init(struct pp_hwmgr *hwmgr) 


	hwmgr->smu_backend = iceland_priv;



	if (smu7_init(hwmgr))

	if (smu7_init(hwmgr)) {

		kfree(iceland_priv);

		return -EINVAL;

	}



	return 0;

}

drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c

+3 −1
Original line number Diff line number Diff line
@@ -349,8 +349,10 @@ static int polaris10_smu_init(struct pp_hwmgr *hwmgr) 


	hwmgr->smu_backend = smu_data;



	if (smu7_init(hwmgr))

	if (smu7_init(hwmgr)) {

		kfree(smu_data);

		return -EINVAL;

	}



	return 0;

}

drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c

+11 −7
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static int rv_smu_init(struct pp_hwmgr *hwmgr) 
			&priv->smu_tables.entry[WMTABLE].table);



	if (r)

		return -EINVAL;

		goto err0;



	priv->smu_tables.entry[WMTABLE].version = 0x01;

	priv->smu_tables.entry[WMTABLE].size = sizeof(Watermarks_t);
@@ -363,18 +363,22 @@ static int rv_smu_init(struct pp_hwmgr *hwmgr) 
			&priv->smu_tables.entry[CLOCKTABLE].mc_addr,

			&priv->smu_tables.entry[CLOCKTABLE].table);



	if (r) {

		amdgpu_bo_free_kernel(&priv->smu_tables.entry[WMTABLE].handle,

					&priv->smu_tables.entry[WMTABLE].mc_addr,

					&priv->smu_tables.entry[WMTABLE].table);

		return -EINVAL;

	}

	if (r)

		goto err1;



	priv->smu_tables.entry[CLOCKTABLE].version = 0x01;

	priv->smu_tables.entry[CLOCKTABLE].size = sizeof(DpmClocks_t);

	priv->smu_tables.entry[CLOCKTABLE].table_id = TABLE_DPMCLOCKS;



	return 0;



err1:

	amdgpu_bo_free_kernel(&priv->smu_tables.entry[WMTABLE].handle,

				&priv->smu_tables.entry[WMTABLE].mc_addr,

				&priv->smu_tables.entry[WMTABLE].table);

err0:

	kfree(priv);

	return -EINVAL;

}



const struct pp_smumgr_func rv_smu_funcs = {