Skip to content

Commit

Permalink
drm/i915: Only destroy a constructed mmap offset
Browse files Browse the repository at this point in the history
drm_ht_remove_item() does not handle removing an absent item and the hlist
in particular is incorrectly initialised. The easy remedy is simply skip
calling i915_gem_free_mmap_offset() unless we have actually created the
offset and associated ht entry.

This also fixes the mishandling of a partially constructed offset which
leaves pointers initialized after freeing them along the
i915_gem_create_mmap_offset() error paths.

In particular this should fix the oops found here:
https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/415357/comments/8

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
Cc: stable@kernel.org
  • Loading branch information
Chris Wilson authored and Eric Anholt committed Sep 11, 2009
1 parent e517a5e commit 7e61615
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -3834,7 +3834,8 @@ void i915_gem_free_object(struct drm_gem_object *obj)

i915_gem_object_unbind(obj);

i915_gem_free_mmap_offset(obj);
if (obj_priv->mmap_offset)
i915_gem_free_mmap_offset(obj);

kfree(obj_priv->page_cpu_valid);
kfree(obj_priv->bit_17);
Expand Down

0 comments on commit 7e61615

Please sign in to comment.