Re: [PATCH] drm/amdgpu/powerplay/vega10: fix memory leak in error path

[Zhu, Rex]

Reviewed-by: Rex Zhu <rex@amd.com>


Best Regards

Rex


From: amd-gfx <amd-gfx-boun...@lists.freedesktop.org> on behalf of Quan, Evan 
<evan.q...@amd.com>
Sent: Wednesday, March 14, 2018 11:20 AM
To: Alex Deucher; amd-gfx@lists.freedesktop.org
Cc: Deucher, Alexander
Subject: RE: [PATCH] drm/amdgpu/powerplay/vega10: fix memory leak in error path

Reviewed-by: Evan Quan <evan.q...@amd.com>

-Original Message-
From: amd-gfx [mailto:amd-gfx-boun...@lists.freedesktop.org] On Behalf Of Alex 
Deucher
Sent: Wednesday, March 14, 2018 9:46 AM
To: amd-gfx@lists.freedesktop.org
Cc: Deucher, Alexander <alexander.deuc...@amd.com>
Subject: [PATCH] drm/amdgpu/powerplay/vega10: fix memory leak in error path

Free the backend structure if we fail to allocate device memory.

Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
---
 drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c 
b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
index 15e1afa28018..219950882be9 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
@@ -406,9 +406,8 @@ static int vega10_smu_init(struct pp_hwmgr *hwmgr)
 ,
 _addr,
 );
-
 if (ret)
-   return -EINVAL;
+   goto free_backend;

 priv->smu_tables.entry[PPTABLE].version = 0x01;
 priv->smu_tables.entry[PPTABLE].size = sizeof(PPTable_t); @@ -511,6 
+510,9 @@ static int vega10_smu_init(struct pp_hwmgr *hwmgr)
 amdgpu_bo_free_kernel(>smu_tables.entry[PPTABLE].handle,
 >smu_tables.entry[PPTABLE].mc_addr,
 >smu_tables.entry[PPTABLE].table);
+free_backend:
+   kfree(hwmgr->smu_backend);
+
 return -EINVAL;
 }

--
2.13.6

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - 
freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx>
lists.freedesktop.org
Subscribing to amd-gfx: Subscribe to amd-gfx by filling out the following form. 
Use of all freedesktop.org lists is subject to our Code of ...


___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - 
freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx>
lists.freedesktop.org
Subscribing to amd-gfx: Subscribe to amd-gfx by filling out the following form. 
Use of all freedesktop.org lists is subject to our Code of ...


___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH] drm/amdgpu/powerplay/vega10: fix memory leak in error path

[Quan, Evan]

Reviewed-by: Evan Quan <evan.q...@amd.com>

-Original Message-
From: amd-gfx [mailto:amd-gfx-boun...@lists.freedesktop.org] On Behalf Of Alex 
Deucher
Sent: Wednesday, March 14, 2018 9:46 AM
To: amd-gfx@lists.freedesktop.org
Cc: Deucher, Alexander <alexander.deuc...@amd.com>
Subject: [PATCH] drm/amdgpu/powerplay/vega10: fix memory leak in error path

Free the backend structure if we fail to allocate device memory.

Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
---
 drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c 
b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
index 15e1afa28018..219950882be9 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
@@ -406,9 +406,8 @@ static int vega10_smu_init(struct pp_hwmgr *hwmgr)
,
_addr,
);
-
if (ret)
-   return -EINVAL;
+   goto free_backend;
 
priv->smu_tables.entry[PPTABLE].version = 0x01;
priv->smu_tables.entry[PPTABLE].size = sizeof(PPTable_t); @@ -511,6 
+510,9 @@ static int vega10_smu_init(struct pp_hwmgr *hwmgr)
amdgpu_bo_free_kernel(>smu_tables.entry[PPTABLE].handle,
>smu_tables.entry[PPTABLE].mc_addr,
>smu_tables.entry[PPTABLE].table);
+free_backend:
+   kfree(hwmgr->smu_backend);
+
return -EINVAL;
 }
 
--
2.13.6

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH] drm/amdgpu/powerplay/vega10: fix memory leak in error path

[Alex Deucher]

Free the backend structure if we fail to allocate device
memory.

Signed-off-by: Alex Deucher 
---
 drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c 
b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
index 15e1afa28018..219950882be9 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
@@ -406,9 +406,8 @@ static int vega10_smu_init(struct pp_hwmgr *hwmgr)
,
_addr,
);
-
if (ret)
-   return -EINVAL;
+   goto free_backend;
 
priv->smu_tables.entry[PPTABLE].version = 0x01;
priv->smu_tables.entry[PPTABLE].size = sizeof(PPTable_t);
@@ -511,6 +510,9 @@ static int vega10_smu_init(struct pp_hwmgr *hwmgr)
amdgpu_bo_free_kernel(>smu_tables.entry[PPTABLE].handle,
>smu_tables.entry[PPTABLE].mc_addr,
>smu_tables.entry[PPTABLE].table);
+free_backend:
+   kfree(hwmgr->smu_backend);
+
return -EINVAL;
 }
 
-- 
2.13.6

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx