linux-kernel - Re: [PATCH] drm/amd/pm: fix a double-free in si_dpm

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CADnq5_PHqy6oQhyycN8xjApo+-1YxuYpJxm+2MwwWCd+mLX6XA@mail.gmail.com>
Date:   Thu, 14 Dec 2023 12:03:14 -0500
From:   Alex Deucher <alexdeucher@...il.com>
To:     Zhipeng Lu <alexious@....edu.cn>
Cc:     Lijo Lazar <lijo.lazar@....com>, Guchun Chen <guchun.chen@....com>,
        dri-devel@...ts.freedesktop.org,
        "Pan, Xinhui" <Xinhui.Pan@....com>,
        Zhenneng Li <lizhenneng@...inos.cn>,
        amd-gfx@...ts.freedesktop.org, linux-kernel@...r.kernel.org,
        Maruthi Bayyavarapu <maruthi.bayyavarapu@....com>,
        Mario Limonciello <mario.limonciello@....com>,
        Alex Deucher <alexander.deucher@....com>,
        Evan Quan <evan.quan@....com>,
        Christian König <christian.koenig@....com>
Subject: Re: [PATCH] drm/amd/pm: fix a double-free in si_dpm_init

Applied.  Thanks!

On Thu, Dec 14, 2023 at 10:59 AM Zhipeng Lu <alexious@....edu.cn> wrote:
>
> 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@....edu.cn>
> ---
>  drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> 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 fc8e4ac6c8e7..df4f20293c16 100644
> --- 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;
> --
> 2.34.1
>