Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d1430a3 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Hold mutex across i915_gem_release 

Inorder to serialise the closing of the file descriptor and its
subsequent release of client requests with i915_gem_free_request(), we
need to hold the struct_mutex in i915_gem_release(). Failing to do so
has the potential to trigger an OOPS, later with a use-after-free.

Testcase: igt/gem_close_race
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70874
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71029


Reported-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5ae68b41

drivers/gpu/drm/i915/i915_dma.c

+2 −0
Original line number Diff line number Diff line
@@ -1848,8 +1848,10 @@ void i915_driver_lastclose(struct drm_device * dev) 


void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)

{

	mutex_lock(&dev->struct_mutex);

	i915_gem_context_close(dev, file_priv);

	i915_gem_release(dev, file_priv);

	mutex_unlock(&dev->struct_mutex);

}



void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)

drivers/gpu/drm/i915/i915_gem_context.c

+0 −2
Original line number Diff line number Diff line
@@ -347,10 +347,8 @@ void i915_gem_context_close(struct drm_device *dev, struct drm_file *file) 
{

	struct drm_i915_file_private *file_priv = file->driver_priv;



	mutex_lock(&dev->struct_mutex);

	idr_for_each(&file_priv->context_idr, context_idr_cleanup, NULL);

	idr_destroy(&file_priv->context_idr);

	mutex_unlock(&dev->struct_mutex);

}



static struct i915_hw_context *