drm/amd/pm: fix a double-free in si_dpm_init

[ Upstream commit ac16667237a82e2597e329eb9bc520d1cf9dff30 ]

When the allocation of
adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries fails,
amdgpu_free_extended_power_table is called to free some fields of adev.
However, when the control flow returns to si_dpm_sw_init, it goes to
label dpm_failed and calls si_dpm_fini, which calls
amdgpu_free_extended_power_table again and free those fields again. Thus
a double-free is triggered.

Fixes: 841686df9f7d ("drm/amdgpu: add SI DPM support (v4)")
Signed-off-by: Zhipeng Lu <alexious@zju.edu.cn>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
index 02e69cc..f81e4bd 100644 (file)
--- a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
+++ b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
@@ -7379,10 +7379,9 @@ static int si_dpm_init(struct amdgpu_device *adev)
                kcalloc(4,
                        sizeof(struct amdgpu_clock_voltage_dependency_entry),
                        GFP_KERNEL);
-       if (!adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries) {
-               amdgpu_free_extended_power_table(adev);
+       if (!adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries)
                return -ENOMEM;
-       }
+
        adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.count = 4;
        adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[0].clk = 0;
        adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[0].v = 0;