Skip to content

Commit

Permalink
drm/i915: fix possible NULL dereference of dev_priv
Browse files Browse the repository at this point in the history
Dereference dev_priv only after we know it is valid.
Found with smatch.

Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Mika Kuoppala authored and Daniel Vetter committed Nov 29, 2012
1 parent fc37381 commit 4f1ba0f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/gpu/drm/i915/i915_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,7 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
{
drm_i915_private_t *dev_priv = dev->dev_private;
drm_i915_hws_addr_t *hws = data;
struct intel_ring_buffer *ring = LP_RING(dev_priv);
struct intel_ring_buffer *ring;

if (drm_core_check_feature(dev, DRIVER_MODESET))
return -ENODEV;
Expand All @@ -1065,6 +1065,7 @@ static int i915_set_status_page(struct drm_device *dev, void *data,

DRM_DEBUG_DRIVER("set status page addr 0x%08x\n", (u32)hws->addr);

ring = LP_RING(dev_priv);
ring->status_page.gfx_addr = hws->addr & (0x1ffff<<12);

dev_priv->dri1.gfx_hws_cpu_addr =
Expand Down

0 comments on commit 4f1ba0f

Please sign in to comment.