| commit | 29732ca5d6284c507cefd0b2b76b05b96b3a4f7d | |
| author | Chris Wilson <chris@chris-wilson.co.uk> | |
| Thu, 10 Sep 2009 07:53:04 +0000 (10 08:53 +0100) | ||
| committer | Greg Kroah-Hartman <gregkh@suse.de> | |
| Mon, 5 Oct 2009 16:32:05 +0000 (5 09:32 -0700) | ||
| tree | 29a33a68eee2ac2fbab9846a971446fabebbd492 | treesnapshot (tar.gz zip) |
| parent | 385c165f9edb248473bc442cc2aa8a95e01e8fdb | commitdiff |
drm/i915: Only destroy a constructed mmap offset
commit 7e61615857c6fb3afbcb43f5c4e97511a923f5a8 upstream.
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>
commit 7e61615857c6fb3afbcb43f5c4e97511a923f5a8 upstream.
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>
| drivers/gpu/drm/i915/i915_gem.c | diffblobblamehistory |