Re: [patch] drm/i915: memory leak in __i915_gem_vma_create()

[Jani Nikula <jani.nikula@linux.intel.com>]

On Wed, 18 Mar 2015, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> 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>

>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index f1b9ea6..cbf013f 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -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);

-- 
Jani Nikula, Intel Open Source Technology Center