diff mbox

drm/nouveau: Do not leak client objects

Message ID 1413453294-15787-1-git-send-email-thierry.reding@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Thierry Reding Oct. 16, 2014, 9:54 a.m. UTC 
From: Thierry Reding <treding@nvidia.com>

The memory allocated for a nouveau_cli object in nouveau_cli_create() is
never freed. Free the memory in nouveau_cli_destroy() to plug this leak.

kmemleak recorded this after running a couple of nouveau test programs.
Note that kmemleak points at drm_open_helper() because for some reason
it thinks that skipping the first two stack frames is a good idea.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/nouveau/nouveau_drm.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Thierry Reding June 5, 2015, 11:35 a.m. UTC | #1 
On Thu, Oct 16, 2014 at 11:54:54AM +0200, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> The memory allocated for a nouveau_cli object in nouveau_cli_create() is
> never freed. Free the memory in nouveau_cli_destroy() to plug this leak.
> 
> kmemleak recorded this after running a couple of nouveau test programs.
> Note that kmemleak points at drm_open_helper() because for some reason
> it thinks that skipping the first two stack frames is a good idea.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
>  drivers/gpu/drm/nouveau/nouveau_drm.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
> index 57238076049f..6dc2c915ba6e 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_drm.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
> @@ -126,6 +126,7 @@ nouveau_cli_destroy(struct nouveau_cli *cli)
>  	nouveau_vm_ref(NULL, &nvkm_client(&cli->base)->vm, NULL);
>  	nvif_client_fini(&cli->base);
>  	usif_client_fini(cli);
> +	kfree(cli);
>  }
>  
>  static void

Ben, any chance you could pick this up?

Thierry
Ben Skeggs June 6, 2015, 1:36 p.m. UTC | #2 
On 5 June 2015 at 21:35, Thierry Reding <thierry.reding@gmail.com> wrote:
> On Thu, Oct 16, 2014 at 11:54:54AM +0200, Thierry Reding wrote:
>> From: Thierry Reding <treding@nvidia.com>
>>
>> The memory allocated for a nouveau_cli object in nouveau_cli_create() is
>> never freed. Free the memory in nouveau_cli_destroy() to plug this leak.
>>
>> kmemleak recorded this after running a couple of nouveau test programs.
>> Note that kmemleak points at drm_open_helper() because for some reason
>> it thinks that skipping the first two stack frames is a good idea.
>>
>> Signed-off-by: Thierry Reding <treding@nvidia.com>
>> ---
>>  drivers/gpu/drm/nouveau/nouveau_drm.c | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
>> index 57238076049f..6dc2c915ba6e 100644
>> --- a/drivers/gpu/drm/nouveau/nouveau_drm.c
>> +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
>> @@ -126,6 +126,7 @@ nouveau_cli_destroy(struct nouveau_cli *cli)
>>       nouveau_vm_ref(NULL, &nvkm_client(&cli->base)->vm, NULL);
>>       nvif_client_fini(&cli->base);
>>       usif_client_fini(cli);
>> +     kfree(cli);
>>  }
>>
>>  static void
>
> Ben, any chance you could pick this up?
Got it :)  Thanks for the ping!

Ben.

>
> Thierry
>
> _______________________________________________
> Nouveau mailing list
> Nouveau@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/nouveau
>
diff mbox

Patch

diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 57238076049f..6dc2c915ba6e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -126,6 +126,7 @@  nouveau_cli_destroy(struct nouveau_cli *cli)
 	nouveau_vm_ref(NULL, &nvkm_client(&cli->base)->vm, NULL);
 	nvif_client_fini(&cli->base);
 	usif_client_fini(cli);
+	kfree(cli);
 }
 
 static void