* [PATCH] drm/amd/pm: Fix a memory leak on an error path
[not found] <PH7PR12MB5997C208CDD4587332346CD782CDA@PH7PR12MB5997.namprd12.prod.outlook.com>
@ 2023-10-10 6:10 ` Kunwu.Chan
[not found] ` <PH7PR12MB5997E8A541A39046B0B3BCB982CDA@PH7PR12MB5997.namprd12.prod.outlook.com>
0 siblings, 1 reply; 3+ messages in thread
From: Kunwu.Chan @ 2023-10-10 6:10 UTC (permalink / raw)
To: kevinyang.wang
Cc: Alexander.Deucher, Asad.Kamal, Christian.Koenig, Hawking.Zhang,
Le.Ma, Lijo.Lazar, Xinhui.Pan, airlied, amd-gfx, chentao,
dan.carpenter, daniel, dri-devel, evan.quan, kunwu.chan,
linux-kernel
Add missing free on an error path.
Fixes: 511a95552ec8 ("drm/amd/pm: Add SMU 13.0.6 support")
Signed-off-by: Kunwu.Chan <chentao@kylinos.cn>
---
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
index ce971a93d28b..c26e12ff532c 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
@@ -1981,8 +1981,10 @@ static ssize_t smu_v13_0_6_get_gpu_metrics(struct smu_context *smu, void **table
metrics = kzalloc(sizeof(MetricsTable_t), GFP_KERNEL);
ret = smu_v13_0_6_get_metrics_table(smu, metrics, true);
- if (ret)
+ if (ret) {
+ kfree(metrics);
return ret;
+ }
smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 3);
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amd/pm: Fix a memory leak on an error path
[not found] ` <PH7PR12MB5997E8A541A39046B0B3BCB982CDA@PH7PR12MB5997.namprd12.prod.outlook.com>
@ 2023-10-10 17:59 ` Alex Deucher
0 siblings, 0 replies; 3+ messages in thread
From: Alex Deucher @ 2023-10-10 17:59 UTC (permalink / raw)
To: Wang, Yang(Kevin)
Cc: Kunwu.Chan, Pan, Xinhui, kunwu.chan, dri-devel, Lazar, Lijo,
linux-kernel, Kamal, Asad, Ma, Le, amd-gfx, Deucher, Alexander,
evan.quan, Koenig, Christian, dan.carpenter, Zhang, Hawking
Applied. Thanks!
Alex
On Tue, Oct 10, 2023 at 2:32 AM Wang, Yang(Kevin)
<KevinYang.Wang@amd.com> wrote:
>
> [AMD Official Use Only - General]
>
> Reviewed-by: Yang Wang <kevinyang.wang@amd.com>
>
> Best Regards,
> Kevin
>
> -----Original Message-----
> From: Kunwu.Chan <chentao@kylinos.cn>
> Sent: Tuesday, October 10, 2023 2:11 PM
> To: Wang, Yang(Kevin) <KevinYang.Wang@amd.com>
> Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Kamal, Asad <Asad.Kamal@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Zhang, Hawking <Hawking.Zhang@amd.com>; Ma, Le <Le.Ma@amd.com>; Lazar, Lijo <Lijo.Lazar@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>; airlied@gmail.com; amd-gfx@lists.freedesktop.org; chentao@kylinos.cn; dan.carpenter@linaro.org; daniel@ffwll.ch; dri-devel@lists.freedesktop.org; evan.quan@amd.com; kunwu.chan@hotmail.com; linux-kernel@vger.kernel.org
> Subject: [PATCH] drm/amd/pm: Fix a memory leak on an error path
>
> Add missing free on an error path.
>
> Fixes: 511a95552ec8 ("drm/amd/pm: Add SMU 13.0.6 support")
> Signed-off-by: Kunwu.Chan <chentao@kylinos.cn>
> ---
> drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
> index ce971a93d28b..c26e12ff532c 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
> @@ -1981,8 +1981,10 @@ static ssize_t smu_v13_0_6_get_gpu_metrics(struct smu_context *smu, void **table
>
> metrics = kzalloc(sizeof(MetricsTable_t), GFP_KERNEL);
> ret = smu_v13_0_6_get_metrics_table(smu, metrics, true);
> - if (ret)
> + if (ret) {
> + kfree(metrics);
> return ret;
> + }
>
> smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 3);
>
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] drm/amd/pm: Fix a memory leak on an error path
@ 2023-10-10 2:19 Kunwu.Chan
0 siblings, 0 replies; 3+ messages in thread
From: Kunwu.Chan @ 2023-10-10 2:19 UTC (permalink / raw)
To: evan.quan, alexander.deucher, christian.koenig, Xinhui.Pan,
airlied, daniel, lijo.lazar, asad.kamal, Hawking.Zhang,
kevinyang.wang, le.ma, dan.carpenter
Cc: amd-gfx, dri-devel, linux-kernel, kunwu.chan, Kunwu.Chan
Add missing free on an error path.
Signed-off-by: Kunwu.Chan <chentao@kylinos.cn>
---
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
index ce971a93d28b..c26e12ff532c 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
@@ -1981,8 +1981,10 @@ static ssize_t smu_v13_0_6_get_gpu_metrics(struct smu_context *smu, void **table
metrics = kzalloc(sizeof(MetricsTable_t), GFP_KERNEL);
ret = smu_v13_0_6_get_metrics_table(smu, metrics, true);
- if (ret)
+ if (ret) {
+ kfree(metrics);
return ret;
+ }
smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 3);
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-10 17:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <PH7PR12MB5997C208CDD4587332346CD782CDA@PH7PR12MB5997.namprd12.prod.outlook.com>
2023-10-10 6:10 ` [PATCH] drm/amd/pm: Fix a memory leak on an error path Kunwu.Chan
[not found] ` <PH7PR12MB5997E8A541A39046B0B3BCB982CDA@PH7PR12MB5997.namprd12.prod.outlook.com>
2023-10-10 17:59 ` Alex Deucher
2023-10-10 2:19 Kunwu.Chan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).