* [PATCH] drm/radeon/dpm: fix a memleak in sumo_parse_power_table
@ 2023-12-03 17:16 Zhipeng Lu
2023-12-04 8:17 ` Christian König
0 siblings, 1 reply; 3+ messages in thread
From: Zhipeng Lu @ 2023-12-03 17:16 UTC (permalink / raw)
To: alexious
Cc: Alex Deucher, Christian König, Pan, Xinhui, David Airlie,
Daniel Vetter, Jerome Glisse, amd-gfx, dri-devel, linux-kernel
The rdev->pm.dpm.ps allocated by kcalloc should be freed in every
following error-handling path. However, in the error-handling of
rdev->pm.power_state[i].clock_info the rdev->pm.dpm.ps is not freed,
resulting in a memleak in this function.
Fixes: 80ea2c129c76 ("drm/radeon/kms: add dpm support for sumo asics (v2)")
Signed-off-by: Zhipeng Lu <alexious@zju.edu.cn>
---
drivers/gpu/drm/radeon/sumo_dpm.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/radeon/sumo_dpm.c b/drivers/gpu/drm/radeon/sumo_dpm.c
index f74f381af05f..bde640053708 100644
--- a/drivers/gpu/drm/radeon/sumo_dpm.c
+++ b/drivers/gpu/drm/radeon/sumo_dpm.c
@@ -1494,6 +1494,7 @@ static int sumo_parse_power_table(struct radeon_device *rdev)
non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *)
&non_clock_info_array->nonClockInfo[non_clock_array_index];
if (!rdev->pm.power_state[i].clock_info)
+ kfree(rdev->pm.dpm.ps);
return -EINVAL;
ps = kzalloc(sizeof(struct sumo_ps), GFP_KERNEL);
if (ps == NULL) {
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/radeon/dpm: fix a memleak in sumo_parse_power_table
2023-12-03 17:16 [PATCH] drm/radeon/dpm: fix a memleak in sumo_parse_power_table Zhipeng Lu
@ 2023-12-04 8:17 ` Christian König
2023-12-04 8:46 ` alexious
0 siblings, 1 reply; 3+ messages in thread
From: Christian König @ 2023-12-04 8:17 UTC (permalink / raw)
To: Zhipeng Lu
Cc: Alex Deucher, Pan, Xinhui, David Airlie, Daniel Vetter,
Jerome Glisse, amd-gfx, dri-devel, linux-kernel
Am 03.12.23 um 18:16 schrieb Zhipeng Lu:
> The rdev->pm.dpm.ps allocated by kcalloc should be freed in every
> following error-handling path. However, in the error-handling of
> rdev->pm.power_state[i].clock_info the rdev->pm.dpm.ps is not freed,
> resulting in a memleak in this function.
>
> Fixes: 80ea2c129c76 ("drm/radeon/kms: add dpm support for sumo asics (v2)")
> Signed-off-by: Zhipeng Lu <alexious@zju.edu.cn>
> ---
> drivers/gpu/drm/radeon/sumo_dpm.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/radeon/sumo_dpm.c b/drivers/gpu/drm/radeon/sumo_dpm.c
> index f74f381af05f..bde640053708 100644
> --- a/drivers/gpu/drm/radeon/sumo_dpm.c
> +++ b/drivers/gpu/drm/radeon/sumo_dpm.c
> @@ -1494,6 +1494,7 @@ static int sumo_parse_power_table(struct radeon_device *rdev)
> non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *)
> &non_clock_info_array->nonClockInfo[non_clock_array_index];
> if (!rdev->pm.power_state[i].clock_info)
> + kfree(rdev->pm.dpm.ps);
> return -EINVAL;
That change is obviously not correct since you now always return -EINVAL.
You need to at least add {} here.
Regards,
Christian.
> ps = kzalloc(sizeof(struct sumo_ps), GFP_KERNEL);
> if (ps == NULL) {
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Re: [PATCH] drm/radeon/dpm: fix a memleak in sumo_parse_power_table
2023-12-04 8:17 ` Christian König
@ 2023-12-04 8:46 ` alexious
0 siblings, 0 replies; 3+ messages in thread
From: alexious @ 2023-12-04 8:46 UTC (permalink / raw)
To: Christian König
Cc: Alex Deucher, Pan, Xinhui, David Airlie, Daniel Vetter,
Jerome Glisse, amd-gfx, dri-devel, linux-kernel
> Am 03.12.23 um 18:16 schrieb Zhipeng Lu:
> > The rdev->pm.dpm.ps allocated by kcalloc should be freed in every
> > following error-handling path. However, in the error-handling of
> > rdev->pm.power_state[i].clock_info the rdev->pm.dpm.ps is not freed,
> > resulting in a memleak in this function.
> >
> > Fixes: 80ea2c129c76 ("drm/radeon/kms: add dpm support for sumo asics (v2)")
> > Signed-off-by: Zhipeng Lu <alexious@zju.edu.cn>
> > ---
> > drivers/gpu/drm/radeon/sumo_dpm.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/gpu/drm/radeon/sumo_dpm.c b/drivers/gpu/drm/radeon/sumo_dpm.c
> > index f74f381af05f..bde640053708 100644
> > --- a/drivers/gpu/drm/radeon/sumo_dpm.c
> > +++ b/drivers/gpu/drm/radeon/sumo_dpm.c
> > @@ -1494,6 +1494,7 @@ static int sumo_parse_power_table(struct radeon_device *rdev)
> > non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *)
> > &non_clock_info_array->nonClockInfo[non_clock_array_index];
> > if (!rdev->pm.power_state[i].clock_info)
> > + kfree(rdev->pm.dpm.ps);
> > return -EINVAL;
>
> That change is obviously not correct since you now always return -EINVAL.
>
> You need to at least add {} here.
>
I'm sorry for my mistake and I'll send a new patch soon.
Regards,
Zhipeng
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-12-04 8:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-03 17:16 [PATCH] drm/radeon/dpm: fix a memleak in sumo_parse_power_table Zhipeng Lu
2023-12-04 8:17 ` Christian König
2023-12-04 8:46 ` alexious
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox