1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
index d9c0f7573905..1669c42c40ed 100644
--- a/drivers/gpu/drm/drm_auth.c
+++ b/drivers/gpu/drm/drm_auth.c
@@ -142,6 +142,7 @@ static int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv)
 
         lockdep_assert_held_once(&dev->master_mutex);
 
+        WARN_ON(fpriv->is_master);
         old_master = fpriv->master;
         fpriv->master = drm_master_create(dev);
         if (!fpriv->master) {
@@ -170,6 +171,7 @@ out_err:
         /* drop references and restore old master on failure */
         drm_master_put(&fpriv->master);
         fpriv->master = old_master;
+        fpriv->is_master = 0;
 
         return ret;
 }