Commit fe4600a5 authored Aug 19, 2017 by Chris Wilson Committed by Joonas Lahtinen Aug 22, 2017

drm: Release driver tracking before making the object available again



This is the same bug as we fixed in commit f6cd7dae ("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: 0ff926c7 ("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

parent a0ffc51e

drivers/gpu/drm/drm_gem.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -255,13 +255,13 @@ drm_gem_object_release_handle(int id, void ptr, void data)
		struct drm_gem_object *obj = ptr;
		struct drm_device *dev = obj->dev;

		if (dev->driver->gem_close_object)
		dev->driver->gem_close_object(obj, file_priv);

		if (drm_core_check_feature(dev, DRIVER_PRIME))
		drm_gem_remove_prime_handles(obj, file_priv);
		drm_vma_node_revoke(&obj->vma_node, file_priv);

		if (dev->driver->gem_close_object)
		dev->driver->gem_close_object(obj, file_priv);

		drm_gem_object_handle_put_unlocked(obj);

		return 0;