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

Commit d46fe2e9 authored by Zhipeng Lu's avatar Zhipeng Lu Committed by Greg Kroah-Hartman
Browse files

drm/radeon/trinity_dpm: fix a memleak in trinity_parse_power_table 



[ Upstream commit 28c28d7f77c06ac2c0b8f9c82bc04eba22912b3b ]

The rdev->pm.dpm.ps allocated by kcalloc should be freed in every
following error-handling path. However, in the error-handling of
rdev->pm.power_state[i].clock_info the rdev->pm.dpm.ps is not freed,
resulting in a memleak in this function.

Fixes: d70229f7 ("drm/radeon/kms: add dpm support for trinity asics")
Signed-off-by: default avatarZhipeng Lu <alexious@zju.edu.cn>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c0769f09

drivers/gpu/drm/radeon/trinity_dpm.c

+3 −1
Original line number Diff line number Diff line
@@ -1771,8 +1771,10 @@ static int trinity_parse_power_table(struct radeon_device *rdev) 
		non_clock_array_index = power_state->v2.nonClockInfoIndex;

		non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *)

			&non_clock_info_array->nonClockInfo[non_clock_array_index];

		if (!rdev->pm.power_state[i].clock_info)

		if (!rdev->pm.power_state[i].clock_info) {

			kfree(rdev->pm.dpm.ps);

			return -EINVAL;

		}

		ps = kzalloc(sizeof(struct sumo_ps), GFP_KERNEL);

		if (ps == NULL) {

			kfree(rdev->pm.dpm.ps);