Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
MIME-Version: 1.0
References: <20231123073325.16843-1-dinghao.liu@zju.edu.cn>
In-Reply-To: <20231123073325.16843-1-dinghao.liu@zju.edu.cn>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Mon, 27 Nov 2023 15:59:39 -0500
Message-ID: <CADnq5_Mm_LtYXAqGp0O0gk4YF-bM3_cBq6RZ-dBrZkSOQMo3qw@mail.gmail.com>
Subject: Re: [PATCH] drm/amd/pm: fix a memleak in aldebaran_tables_init
To:     Dinghao Liu <dinghao.liu@zju.edu.cn>
Cc:     Yifan Zhang <yifan1.zhang@amd.com>,
        Lijo Lazar <lijo.lazar@amd.com>,
        Yang Wang <kevinyang.wang@amd.com>,
        dri-devel@lists.freedesktop.org,
        "Pan, Xinhui" <Xinhui.Pan@amd.com>, linux-kernel@vger.kernel.org,
        amd-gfx@lists.freedesktop.org, Le Ma <le.ma@amd.com>,
        "Stanley.Yang" <Stanley.Yang@amd.com>,
        Mario Limonciello <mario.limonciello@amd.com>,
        Darren Powell <darren.powell@amd.com>,
        Alex Deucher <alexander.deucher@amd.com>,
        Evan Quan <evan.quan@amd.com>,
        =?UTF-8?Q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>,
        Hawking Zhang <Hawking.Zhang@amd.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Applied.  Thanks!

On Thu, Nov 23, 2023 at 3:08=E2=80=AFAM Dinghao Liu <dinghao.liu@zju.edu.cn=
> wrote:
>
> When kzalloc() for smu_table->ecc_table fails, we should free
> the previously allocated resources to prevent memleak.
>
> Fixes: edd794208555 ("drm/amd/pm: add message smu to get ecc_table v2")
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> ---
>  drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c b/drivers=
/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
> index 1a6675d70a4b..f1440869d1ce 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
> @@ -257,8 +257,11 @@ static int aldebaran_tables_init(struct smu_context =
*smu)
>         }
>
>         smu_table->ecc_table =3D kzalloc(tables[SMU_TABLE_ECCINFO].size, =
GFP_KERNEL);
> -       if (!smu_table->ecc_table)
> +       if (!smu_table->ecc_table) {
> +               kfree(smu_table->metrics_table);
> +               kfree(smu_table->gpu_metrics_table);
>                 return -ENOMEM;
> +       }
>
>         return 0;
>  }
> --
> 2.17.1
>