Skip to content

Commit 2a9d766

Browse files
icklegregkh
authored andcommitted
drm: Release driver tracking before making the object available again
commit fe4600a548f2763dec91b3b27a1245c370ceee2a upstream. 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: 0ff926c ("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> 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 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 33e4c63 commit 2a9d766

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/gpu/drm/drm_gem.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -715,13 +715,13 @@ drm_gem_object_release_handle(int id, void *ptr, void *data)
715715
struct drm_gem_object *obj = ptr;
716716
struct drm_device *dev = obj->dev;
717717

718+
if (dev->driver->gem_close_object)
719+
dev->driver->gem_close_object(obj, file_priv);
720+
718721
if (drm_core_check_feature(dev, DRIVER_PRIME))
719722
drm_gem_remove_prime_handles(obj, file_priv);
720723
drm_vma_node_revoke(&obj->vma_node, file_priv->filp);
721724

722-
if (dev->driver->gem_close_object)
723-
dev->driver->gem_close_object(obj, file_priv);
724-
725725
drm_gem_object_handle_unreference_unlocked(obj);
726726

727727
return 0;

0 commit comments

Comments
 (0)