aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>2015-09-11 05:30:56 -0400
committerBen Skeggs <bskeggs@redhat.com>2015-11-03 00:02:18 -0500
commitbad4274a69328256eb3eaad4baaefd1b33491f7e (patch)
tree935ccd7cd54b2570688b08d1530c336f3350f761
parent4458c5639ba827d494ab06a81d1bb129ca5aea91 (diff)
drm/nouveau: fix memory leak
If pm_runtime_get_sync() we were going to "out" but we missed freeing vma. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_gem.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 6bf1a7895708..a108cc37512a 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)
84 } 84 }
85 85
86 ret = pm_runtime_get_sync(dev); 86 ret = pm_runtime_get_sync(dev);
87 if (ret < 0 && ret != -EACCES) 87 if (ret < 0 && ret != -EACCES) {
88 kfree(vma);
88 goto out; 89 goto out;
90 }
89 91
90 ret = nouveau_bo_vma_add(nvbo, cli->vm, vma); 92 ret = nouveau_bo_vma_add(nvbo, cli->vm, vma);
91 if (ret) 93 if (ret)