Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1360789 > unrolled thread

[PATCH] drm/amd/powerplay: fix memory leak of tdp_table

Started byColin King <colin.king@canonical.com>
First post2016-03-18 17:50 +0100
Last post2016-03-18 20:20 +0100
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] drm/amd/powerplay: fix memory leak of tdp_table Colin King <colin.king@canonical.com> - 2016-03-18 17:50 +0100
    Re: [PATCH] drm/amd/powerplay: fix memory leak of tdp_table Alex Deucher <alexdeucher@gmail.com> - 2016-03-18 20:20 +0100

#1360789 — [PATCH] drm/amd/powerplay: fix memory leak of tdp_table

FromColin King <colin.king@canonical.com>
Date2016-03-18 17:50 +0100
Subject[PATCH] drm/amd/powerplay: fix memory leak of tdp_table
Message-ID<re5L4-23u-25@gated-at.bofh.it>
From: Colin Ian King <colin.king@canonical.com>

tdp_table is being leaked on failed allocations of
hwmgr->dyn_state.cac_dtp_table. kfree tdp_table on the error
return path to fix the leak.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
index 34f4bef..b156481 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
@@ -512,8 +512,10 @@ static int get_cac_tdp_table(
 
 	hwmgr->dyn_state.cac_dtp_table = kzalloc(table_size, GFP_KERNEL);
 
-	if (NULL == hwmgr->dyn_state.cac_dtp_table)
+	if (NULL == hwmgr->dyn_state.cac_dtp_table) {
+		kfree(tdp_table);
 		return -ENOMEM;
+	}
 
 	memset(hwmgr->dyn_state.cac_dtp_table, 0x00, table_size);
 
-- 
2.7.3

[toc] | [next] | [standalone]


#1360877

FromAlex Deucher <alexdeucher@gmail.com>
Date2016-03-18 20:20 +0100
Message-ID<re86e-5Tk-11@gated-at.bofh.it>
In reply to#1360789
On Fri, Mar 18, 2016 at 12:47 PM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> tdp_table is being leaked on failed allocations of
> hwmgr->dyn_state.cac_dtp_table. kfree tdp_table on the error
> return path to fix the leak.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Applied,  thanks!

Alex


> ---
>  drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
> index 34f4bef..b156481 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
> @@ -512,8 +512,10 @@ static int get_cac_tdp_table(
>
>         hwmgr->dyn_state.cac_dtp_table = kzalloc(table_size, GFP_KERNEL);
>
> -       if (NULL == hwmgr->dyn_state.cac_dtp_table)
> +       if (NULL == hwmgr->dyn_state.cac_dtp_table) {
> +               kfree(tdp_table);
>                 return -ENOMEM;
> +       }
>
>         memset(hwmgr->dyn_state.cac_dtp_table, 0x00, table_size);
>
> --
> 2.7.3
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web