summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_auth.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2016-06-17 09:33:20 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-06-20 22:02:01 +0200
commita77316bf24f4a86482397707997ff7c951caca56 (patch)
tree5d2bc3b37cf022cddd7d9abe9f43cd9a8fb85770 /drivers/gpu/drm/drm_auth.c
parentdrm: Only do the hw.lock cleanup in master_relase for !MODESET (diff)
downloadlinux-a77316bf24f4a86482397707997ff7c951caca56.tar.xz
linux-a77316bf24f4a86482397707997ff7c951caca56.zip
drm: Move authmagic cleanup into drm_master_release
It's related, and soon authmagic will also use the master_mutex. There is an ever-so-slightly semantic change here: - authmagic will only be cleaned up for primary_client drm_minors. But it's impossible to create authmagic on render/control nodes, so this is fine. - The cleanup is moved down a bit in the release processing. Doesn't matter at all since authmagic is purely internal logic used by the core ioctl access checks, and when we're in a file's release callback no one can do ioctls any more. v2: Rebased. Cc: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v1) Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1466148814-8194-3-git-send-email-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers/gpu/drm/drm_auth.c')
-rw-r--r--drivers/gpu/drm/drm_auth.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
index 54ad64a6d052..24f0f2dc1cce 100644
--- a/drivers/gpu/drm/drm_auth.c
+++ b/drivers/gpu/drm/drm_auth.c
@@ -248,6 +248,11 @@ void drm_master_release(struct drm_file *file_priv)
struct drm_device *dev = file_priv->minor->dev;
struct drm_master *master = file_priv->master;
+ mutex_lock(&dev->struct_mutex);
+ if (file_priv->magic)
+ idr_remove(&file_priv->master->magic_map, file_priv->magic);
+ mutex_unlock(&dev->struct_mutex);
+
mutex_lock(&dev->master_mutex);
if (!file_priv->is_master)
goto out;