Commit c2df2201 authored May 24, 2019 by Colin Ian King Committed by Chris Wilson May 27, 2019

drm/i915/gtt: set err to -ENOMEM on memory allocation failure

Currently when the allocation of ppgtt->work fails the error return
path via err_free returns an uninitialized value in err. Fix this
by setting err to the appropriate error return of -ENOMEM.

Addresses-Coverity: ("Uninitialized scalar variable")
Fixes: d3622099 ("drm/i915/gtt: Always acquire struct_mutex for gen6_ppgtt_cleanup")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190524212627.24256-1-colin.king@canonical.com

parent 5c27de1d

drivers/gpu/drm/i915/i915_gem_gtt.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -2063,8 +2063,10 @@ static struct i915_hw_ppgtt gen6_ppgtt_create(struct drm_i915_private i915)
		ppgtt->base.vm.pte_encode = ggtt->vm.pte_encode;

		ppgtt->work = kmalloc(sizeof(*ppgtt->work), GFP_KERNEL);
		if (!ppgtt->work)
		if (!ppgtt->work) {
		err = -ENOMEM;
		goto err_free;
		}

		err = gen6_ppgtt_init_scratch(ppgtt);
		if (err)