Commit dabde5c7 authored Mar 18, 2015 by Dan Carpenter Committed by Daniel Vetter Mar 20, 2015

drm/i915: memory leak in __i915_gem_vma_create()



In the original code then if WARN_ON(i915_is_ggtt(vm) != !!ggtt_view)
was true then we leak "vma".  Presumably that doesn't happen often but
static checkers complain and this bug is easy to fix.

Fixes: c3bbb6f2825d ('drm/i915: Do not use ggtt_view with (aliasing) PPGTT')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent a1ddefd8

drivers/gpu/drm/i915/i915_gem_gtt.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -2340,12 +2340,13 @@ __i915_gem_vma_create(struct drm_i915_gem_object *obj,
		struct i915_address_space *vm,
		const struct i915_ggtt_view *ggtt_view)
		{
		struct i915_vma vma = kzalloc(sizeof(vma), GFP_KERNEL);
		if (vma == NULL)
		return ERR_PTR(-ENOMEM);
		struct i915_vma *vma;

		if (WARN_ON(i915_is_ggtt(vm) != !!ggtt_view))
		return ERR_PTR(-EINVAL);
		vma = kzalloc(sizeof(*vma), GFP_KERNEL);
		if (vma == NULL)
		return ERR_PTR(-ENOMEM);

		INIT_LIST_HEAD(&vma->vma_link);
		INIT_LIST_HEAD(&vma->mm_list);