diff options
| author | Zhipeng Lu <[email protected]> | 2023-12-15 00:24:58 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2024-01-25 14:52:43 -0800 |
| commit | b6dcba02ee178282e0d28684d241e0b8462dea6a (patch) | |
| tree | 77019e2bbd4bd0ce59042f7d386344adc7988fd9 | |
| parent | 2bf47c89bbaca2bae16581ef1b28aaec0ade0334 (diff) | |
| download | linux-b6dcba02ee178282e0d28684d241e0b8462dea6a.tar.gz | |
drivers/amd/pm: fix a use-after-free in kv_parse_power_table
[ Upstream commit 28dd788382c43b330480f57cd34cde0840896743 ]
When ps allocated by kzalloc equals to NULL, kv_parse_power_table
frees adev->pm.dpm.ps that allocated before. However, after the control
flow goes through the following call chains:
kv_parse_power_table
|-> kv_dpm_init
|-> kv_dpm_sw_init
|-> kv_dpm_fini
The adev->pm.dpm.ps is used in the for loop of kv_dpm_fini after its
first free in kv_parse_power_table and causes a use-after-free bug.
Fixes: a2e73f56fa62 ("drm/amdgpu: Add support for CIK parts")
Signed-off-by: Zhipeng Lu <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c b/drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c index 6ba4c2ae69a630..309c9f0b8f83a7 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c +++ b/drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c @@ -2731,10 +2731,8 @@ static int kv_parse_power_table(struct amdgpu_device *adev) non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) &non_clock_info_array->nonClockInfo[non_clock_array_index]; ps = kzalloc(sizeof(struct kv_ps), GFP_KERNEL); - if (ps == NULL) { - kfree(adev->pm.dpm.ps); + if (ps == NULL) return -ENOMEM; - } adev->pm.dpm.ps[i].ps_priv = ps; k = 0; idx = (u8 *)&power_state->v2.clockInfoIndex[0]; |