Message ID | 20190524212627.24256-1-colin.king@canonical.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [next] drm/i915/gtt: set err to -ENOMEM on memory allocation failure | expand |
Quoting Colin King (2019-05-24 22:26:27) > From: Colin Ian King <colin.king@canonical.com> > > 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: d3622099c76f ("drm/i915/gtt: Always acquire struct_mutex for gen6_ppgtt_cleanup") > Signed-off-by: Colin Ian King <colin.king@canonical.com> Saw that last night but got distracted by the panic-on-boot... Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> -Chris
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 8d8a4b0ad4d9..8a9b506387d4 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -2035,8 +2035,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)