* [PATCH] drm/amdgpu/powerplay/psm: Fix memory leak in power state init
@ 2022-10-18 0:53 Rafael Mendonca
2022-10-18 1:06 ` Quan, Evan
0 siblings, 1 reply; 3+ messages in thread
From: Rafael Mendonca @ 2022-10-18 0:53 UTC (permalink / raw)
To: Evan Quan, Alex Deucher, Christian König, Pan, Xinhui,
David Airlie, Daniel Vetter
Cc: Rafael Mendonca, amd-gfx, dri-devel, linux-kernel
Commit 902bc65de0b3 ("drm/amdgpu/powerplay/psm: return an error in power
state init") made the power state init function return early in case of
failure to get an entry from the powerplay table, but it missed to clean up
the allocated memory for the current power state before returning.
Fixes: 902bc65de0b3 ("drm/amdgpu/powerplay/psm: return an error in power state init")
Signed-off-by: Rafael Mendonca <rafaelmendsr@gmail.com>
---
drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c
index 67d7da0b6fed..1d829402cd2e 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c
@@ -75,8 +75,10 @@ int psm_init_power_state_table(struct pp_hwmgr *hwmgr)
for (i = 0; i < table_entries; i++) {
result = hwmgr->hwmgr_func->get_pp_table_entry(hwmgr, i, state);
if (result) {
+ kfree(hwmgr->current_ps);
kfree(hwmgr->request_ps);
kfree(hwmgr->ps);
+ hwmgr->current_ps = NULL;
hwmgr->request_ps = NULL;
hwmgr->ps = NULL;
return -EINVAL;
--
2.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH] drm/amdgpu/powerplay/psm: Fix memory leak in power state init
2022-10-18 0:53 [PATCH] drm/amdgpu/powerplay/psm: Fix memory leak in power state init Rafael Mendonca
@ 2022-10-18 1:06 ` Quan, Evan
2022-10-18 15:59 ` Alex Deucher
0 siblings, 1 reply; 3+ messages in thread
From: Quan, Evan @ 2022-10-18 1:06 UTC (permalink / raw)
To: Rafael Mendonca, Deucher, Alexander, Koenig, Christian, Pan,
Xinhui, David Airlie, Daniel Vetter
Cc: amd-gfx, dri-devel, linux-kernel
[AMD Official Use Only - General]
Reviewed-by: Evan Quan <evan.quan@amd.com>
> -----Original Message-----
> From: Rafael Mendonca <rafaelmendsr@gmail.com>
> Sent: Tuesday, October 18, 2022 8:54 AM
> To: Quan, Evan <Evan.Quan@amd.com>; Deucher, Alexander
> <Alexander.Deucher@amd.com>; Koenig, Christian
> <Christian.Koenig@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>; David
> Airlie <airlied@gmail.com>; Daniel Vetter <daniel@ffwll.ch>
> Cc: Rafael Mendonca <rafaelmendsr@gmail.com>; amd-
> gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; linux-
> kernel@vger.kernel.org
> Subject: [PATCH] drm/amdgpu/powerplay/psm: Fix memory leak in power
> state init
>
> Commit 902bc65de0b3 ("drm/amdgpu/powerplay/psm: return an error in
> power state init") made the power state init function return early in case of
> failure to get an entry from the powerplay table, but it missed to clean up the
> allocated memory for the current power state before returning.
>
> Fixes: 902bc65de0b3 ("drm/amdgpu/powerplay/psm: return an error in
> power state init")
> Signed-off-by: Rafael Mendonca <rafaelmendsr@gmail.com>
> ---
> drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c
> b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c
> index 67d7da0b6fed..1d829402cd2e 100644
> --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c
> +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c
> @@ -75,8 +75,10 @@ int psm_init_power_state_table(struct pp_hwmgr
> *hwmgr)
> for (i = 0; i < table_entries; i++) {
> result = hwmgr->hwmgr_func->get_pp_table_entry(hwmgr,
> i, state);
> if (result) {
> + kfree(hwmgr->current_ps);
> kfree(hwmgr->request_ps);
> kfree(hwmgr->ps);
> + hwmgr->current_ps = NULL;
> hwmgr->request_ps = NULL;
> hwmgr->ps = NULL;
> return -EINVAL;
> --
> 2.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amdgpu/powerplay/psm: Fix memory leak in power state init
2022-10-18 1:06 ` Quan, Evan
@ 2022-10-18 15:59 ` Alex Deucher
0 siblings, 0 replies; 3+ messages in thread
From: Alex Deucher @ 2022-10-18 15:59 UTC (permalink / raw)
To: Quan, Evan
Cc: Rafael Mendonca, Deucher, Alexander, Koenig, Christian, Pan,
Xinhui, David Airlie, Daniel Vetter, dri-devel, amd-gfx,
linux-kernel
Applied. Thanks!
Alex
On Mon, Oct 17, 2022 at 9:07 PM Quan, Evan <Evan.Quan@amd.com> wrote:
>
> [AMD Official Use Only - General]
>
> Reviewed-by: Evan Quan <evan.quan@amd.com>
>
> > -----Original Message-----
> > From: Rafael Mendonca <rafaelmendsr@gmail.com>
> > Sent: Tuesday, October 18, 2022 8:54 AM
> > To: Quan, Evan <Evan.Quan@amd.com>; Deucher, Alexander
> > <Alexander.Deucher@amd.com>; Koenig, Christian
> > <Christian.Koenig@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>; David
> > Airlie <airlied@gmail.com>; Daniel Vetter <daniel@ffwll.ch>
> > Cc: Rafael Mendonca <rafaelmendsr@gmail.com>; amd-
> > gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; linux-
> > kernel@vger.kernel.org
> > Subject: [PATCH] drm/amdgpu/powerplay/psm: Fix memory leak in power
> > state init
> >
> > Commit 902bc65de0b3 ("drm/amdgpu/powerplay/psm: return an error in
> > power state init") made the power state init function return early in case of
> > failure to get an entry from the powerplay table, but it missed to clean up the
> > allocated memory for the current power state before returning.
> >
> > Fixes: 902bc65de0b3 ("drm/amdgpu/powerplay/psm: return an error in
> > power state init")
> > Signed-off-by: Rafael Mendonca <rafaelmendsr@gmail.com>
> > ---
> > drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c
> > b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c
> > index 67d7da0b6fed..1d829402cd2e 100644
> > --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c
> > +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c
> > @@ -75,8 +75,10 @@ int psm_init_power_state_table(struct pp_hwmgr
> > *hwmgr)
> > for (i = 0; i < table_entries; i++) {
> > result = hwmgr->hwmgr_func->get_pp_table_entry(hwmgr,
> > i, state);
> > if (result) {
> > + kfree(hwmgr->current_ps);
> > kfree(hwmgr->request_ps);
> > kfree(hwmgr->ps);
> > + hwmgr->current_ps = NULL;
> > hwmgr->request_ps = NULL;
> > hwmgr->ps = NULL;
> > return -EINVAL;
> > --
> > 2.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-18 15:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-18 0:53 [PATCH] drm/amdgpu/powerplay/psm: Fix memory leak in power state init Rafael Mendonca
2022-10-18 1:06 ` Quan, Evan
2022-10-18 15:59 ` Alex Deucher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®