diff options
| author | Zhipeng Lu <[email protected]> | 2023-12-15 00:24:58 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2024-01-25 14:37:48 -0800 |
| commit | 520e213a0b97b64735a13950e9371e0a5d7a5dc3 (patch) | |
| tree | cf7d9f6a12ddc15330179c302351ed03b43cc895 | |
| parent | aeed2b4e4a70c7568d4a5eecd6a109713c0dfbf4 (diff) | |
| download | linux-520e213a0b97b64735a13950e9371e0a5d7a5dc3.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 c8a5a5698edd90..6eb6f05c11367f 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c +++ b/drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c @@ -2733,10 +2733,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]; |