Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-…

…fixes nouveau memleak fix * 'linux-4.15' of git://github.com/skeggsb/linux: drm/nouveau: fix obvious memory leak
mariux64 · Dec 21, 2017 · 2480ee7 · 2480ee7
2 parents 51b83e1 + 4ef9289
commit 2480ee7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/gpu/drm/nouveau/nouveau_vmm.c b/drivers/gpu/drm/nouveau/nouveau_vmm.c
@@ -67,8 +67,8 @@ nouveau_vma_del(struct nouveau_vma **pvma)
 			nvif_vmm_put(&vma->vmm->vmm, &tmp);
 		}
 		list_del(&vma->head);
-		*pvma = NULL;
 		kfree(*pvma);
+		*pvma = NULL;
 	}
 }