lkml.org 
[lkml]   [2014]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 044/129] drm/i915: Hold mutex across i915_gem_release
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Chris Wilson <chris@chris-wilson.co.uk>

    commit 0d1430a3f4b7cfd8779b78740a4182321f3ca7f3 upstream.

    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: Eric Anholt <eric@anholt.net>
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/i915/i915_dma.c | 2 ++
    drivers/gpu/drm/i915/i915_gem_context.c | 2 --
    2 files changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/gpu/drm/i915/i915_dma.c
    +++ b/drivers/gpu/drm/i915/i915_dma.c
    @@ -1847,8 +1847,10 @@ void i915_driver_lastclose(struct drm_de

    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)
    --- a/drivers/gpu/drm/i915/i915_gem_context.c
    +++ b/drivers/gpu/drm/i915/i915_gem_context.c
    @@ -291,10 +291,8 @@ void i915_gem_context_close(struct drm_d
    {
    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 *



    \
     
     \ /
      Last update: 2014-01-07 01:21    [W:3.021 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site