diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-08-19 08:05:58 -0400 |
---|---|---|
committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2017-08-22 09:03:43 -0400 |
commit | fe4600a548f2763dec91b3b27a1245c370ceee2a (patch) | |
tree | aa34827d35580d03bebbb1dad9bf0483e5e80242 | |
parent | a0ffc51e20e90e0c1c2491de2b4b03f48b6caaba (diff) |
drm: Release driver tracking before making the object available again
This is the same bug as we fixed in commit f6cd7daecff5 ("drm: Release
driver references to handle before making it available again"), but now
the exposure is via the PRIME lookup tables. If we remove the
object/handle from the PRIME lut, then a new request for the same
object/fd will generate a new handle, thus for a short window that
object is known to userspace by two different handles. Fix this by
releasing the driver tracking before PRIME.
Fixes: 0ff926c7d4f0 ("drm/prime: add exported buffers to current fprivs
imported buffer list (v2)")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Thierry Reding <treding@nvidia.com>
Cc: stable@vger.kernel.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170819120558.6465-1-chris@chris-wilson.co.uk
-rw-r--r-- | drivers/gpu/drm/drm_gem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 8dc11064253d..cdaac37907b1 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c | |||
@@ -255,13 +255,13 @@ drm_gem_object_release_handle(int id, void *ptr, void *data) | |||
255 | struct drm_gem_object *obj = ptr; | 255 | struct drm_gem_object *obj = ptr; |
256 | struct drm_device *dev = obj->dev; | 256 | struct drm_device *dev = obj->dev; |
257 | 257 | ||
258 | if (dev->driver->gem_close_object) | ||
259 | dev->driver->gem_close_object(obj, file_priv); | ||
260 | |||
258 | if (drm_core_check_feature(dev, DRIVER_PRIME)) | 261 | if (drm_core_check_feature(dev, DRIVER_PRIME)) |
259 | drm_gem_remove_prime_handles(obj, file_priv); | 262 | drm_gem_remove_prime_handles(obj, file_priv); |
260 | drm_vma_node_revoke(&obj->vma_node, file_priv); | 263 | drm_vma_node_revoke(&obj->vma_node, file_priv); |
261 | 264 | ||
262 | if (dev->driver->gem_close_object) | ||
263 | dev->driver->gem_close_object(obj, file_priv); | ||
264 | |||
265 | drm_gem_object_handle_put_unlocked(obj); | 265 | drm_gem_object_handle_put_unlocked(obj); |
266 | 266 | ||
267 | return 0; | 267 | return 0; |