[PATCH] drm/nouveau: fix memory leak

[PATCH] drm/nouveau: fix memory leak

[Sudip Mukherjee]

If pm_runtime_get_sync() we were going to "out" but we missed freeing
vma.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 2c99815..c05b2f7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -84,8 +84,10 @@ nouveau_gem_object_open(struct drm_gem_object *gem, struct drm_file *file_priv)
 		}
 
 		ret = pm_runtime_get_sync(dev);
-		if (ret < 0 && ret != -EACCES)
+		if (ret < 0 && ret != -EACCES) {
+			kfree(vma);
 			goto out;
+		}
 
 		ret = nouveau_bo_vma_add(nvbo, cli->vm, vma);
 		if (ret)
-- 
1.9.1

Re: [PATCH] drm/nouveau: fix memory leak

[Sudip Mukherjee]

On Fri, Sep 11, 2015 at 03:00:56PM +0530, Sudip Mukherjee wrote:
> If pm_runtime_get_sync() we were going to "out" but we missed freeing
> vma.
> 
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> ---
Hi Ben,
Another gentle ping for another patch.

regards
sudip

Re: [PATCH] drm/nouveau: fix memory leak

[Ben Skeggs]

On 09/25/2015 01:59 AM, Sudip Mukherjee wrote:
> On Fri, Sep 11, 2015 at 03:00:56PM +0530, Sudip Mukherjee wrote:
>> If pm_runtime_get_sync() we were going to "out" but we missed
>> freeing vma.
>> 
>> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> ---
> Hi Ben, Another gentle ping for another patch.
Both patches are in my tree.

Thanks,
Ben.

> 
> regards sudip _______________________________________________ 
> dri-devel mailing list dri-devel@lists.freedesktop.org 
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
> 

Re: [PATCH] drm/nouveau: fix memory leak

[Sudip Mukherjee]

On Thu, Oct 01, 2015 at 04:40:59PM +1000, Ben Skeggs wrote:
> On 09/25/2015 01:59 AM, Sudip Mukherjee wrote:
> > On Fri, Sep 11, 2015 at 03:00:56PM +0530, Sudip Mukherjee wrote:
> >> If pm_runtime_get_sync() we were going to "out" but we missed
> >> freeing vma.
> >> 
> >> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> ---
> > Hi Ben, Another gentle ping for another patch.
> Both patches are in my tree.

Thanks Ben.

regards
sudip

Re: [PATCH] drm/nouveau: fix memory leak

[Sudip Mukherjee]

On Thu, Oct 01, 2015 at 04:40:59PM +1000, Ben Skeggs wrote:
> On 09/25/2015 01:59 AM, Sudip Mukherjee wrote:
> > On Fri, Sep 11, 2015 at 03:00:56PM +0530, Sudip Mukherjee wrote:
> >> If pm_runtime_get_sync() we were going to "out" but we missed
> >> freeing vma.
> >> 
> >> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> ---
> > Hi Ben, Another gentle ping for another patch.
> Both patches are in my tree.

Hi Ben,
I am not seeing these in linux-next.

regards
sudip

Re: [PATCH] drm/nouveau: fix memory leak

[Emil Velikov]

On 8 October 2015 at 14:00, Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote:
> On Thu, Oct 01, 2015 at 04:40:59PM +1000, Ben Skeggs wrote:
>> On 09/25/2015 01:59 AM, Sudip Mukherjee wrote:
>> > On Fri, Sep 11, 2015 at 03:00:56PM +0530, Sudip Mukherjee wrote:
>> >> If pm_runtime_get_sync() we were going to "out" but we missed
>> >> freeing vma.
>> >>
>> >> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> ---
>> > Hi Ben, Another gentle ping for another patch.
>> Both patches are in my tree.
>
> Hi Ben,
> I am not seeing these in linux-next.
>
The nouveau tree does not merge into linux-next I'm afraid. Perhaps we
should as Ben gets the chance/time.

Regards,
Emil

Re: [PATCH] drm/nouveau: fix memory leak

[Sudip Mukherjee]

On Thu, Oct 08, 2015 at 03:22:20PM +0100, Emil Velikov wrote:
> On 8 October 2015 at 14:00, Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote:
> > On Thu, Oct 01, 2015 at 04:40:59PM +1000, Ben Skeggs wrote:
> >> On 09/25/2015 01:59 AM, Sudip Mukherjee wrote:
> >> > On Fri, Sep 11, 2015 at 03:00:56PM +0530, Sudip Mukherjee wrote:
> >> >> If pm_runtime_get_sync() we were going to "out" but we missed
> >> >> freeing vma.
> >> >>
> >> >> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> ---
> >> > Hi Ben, Another gentle ping for another patch.
> >> Both patches are in my tree.
> >
> > Hi Ben,
> > I am not seeing these in linux-next.
> >
> The nouveau tree does not merge into linux-next I'm afraid. Perhaps we
> should as Ben gets the chance/time.

Can I be of any help in that? Maybe I can learn few things about drm in
the proces.

regards
sudip