summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau
diff options
context:
space:
mode:
authorSudip Mukherjee2015-09-11 11:30:56 +0200
committerBen Skeggs2015-11-03 06:02:18 +0100
commitbad4274a69328256eb3eaad4baaefd1b33491f7e (patch)
tree935ccd7cd54b2570688b08d1530c336f3350f761 /drivers/gpu/drm/nouveau
parentdrm/nouveau: remove unused function (diff)
downloadkernel-qcow2-linux-bad4274a69328256eb3eaad4baaefd1b33491f7e.tar.gz
kernel-qcow2-linux-bad4274a69328256eb3eaad4baaefd1b33491f7e.tar.xz
kernel-qcow2-linux-bad4274a69328256eb3eaad4baaefd1b33491f7e.zip
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>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
-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)
}
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)