From: fred gao Date: Wed, 16 Aug 2017 07:48:03 +0000 (+0800) Subject: drm/i915/gvt: Fix the kernel null pointer error X-Git-Tag: MMI-PSA29.97-13-9~4930^2~1^2^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ffeaf9aaf97b4bdaf114d6df52f800d71918768c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/i915/gvt: Fix the kernel null pointer error once error happens in shadow_indirect_ctx function, the variable wa_ctx->indirect_ctx.obj is not initialized but accessed, so the kernel null point panic occurs. Fixes: 894cf7d15634 ("drm/i915/gvt: i915_gem_object_create() returns an error pointer") Cc: stable@vger.kernel.org # v4.8+ Signed-off-by: fred gao Signed-off-by: Zhenyu Wang --- diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c index 713848c36349..e556a46cd4c2 100644 --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c @@ -2714,7 +2714,7 @@ static int shadow_indirect_ctx(struct intel_shadow_wa_ctx *wa_ctx) unmap_src: i915_gem_object_unpin_map(obj); put_obj: - i915_gem_object_put(wa_ctx->indirect_ctx.obj); + i915_gem_object_put(obj); return ret; }