drm/i915: Only destroy a constructed mmap offset
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
This commit is contained in:
parent
e517a5e970
commit
7e61615857
|
@ -3834,6 +3834,7 @@ void i915_gem_free_object(struct drm_gem_object *obj)
|
|||
|
||||
i915_gem_object_unbind(obj);
|
||||
|
||||
if (obj_priv->mmap_offset)
|
||||
i915_gem_free_mmap_offset(obj);
|
||||
|
||||
kfree(obj_priv->page_cpu_valid);
|
||||
|
|
Loading…
Reference in New Issue