From: Chris Wilson Date: Mon, 24 Jan 2011 12:34:00 +0000 (+0000) Subject: drm/i915: Prevent uninitialised reads during error state capture X-Git-Tag: upstream/snapshot3+hdmi~11448^2~4^2~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e934dbf264418afe4d1dff34ce074ecc14280db;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git drm/i915: Prevent uninitialised reads during error state capture error_bo and pinned_bo could be used uninitialised if there were no active buffers. Caught by kmemcheck. Signed-off-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 4b5a35c..062f353 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -846,6 +846,8 @@ static void i915_capture_error_state(struct drm_device *dev) i++; error->pinned_bo_count = i - error->active_bo_count; + error->active_bo = NULL; + error->pinned_bo = NULL; if (i) { error->active_bo = kmalloc(sizeof(*error->active_bo)*i, GFP_ATOMIC);