Merge tag 'nios2-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...

[linux.git] / drivers / gpu / drm / drm_auth.c

diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
index aad468d170a7e786fb5c460b6dd01ecff015ef3a..d9c0f75739054d88f9533a47684ec4c6f9fb30bf 100644 (file)
--- a/drivers/gpu/drm/drm_auth.c
+++ b/drivers/gpu/drm/drm_auth.c
@@ -230,6 +230,12 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
        if (!dev->master)
                goto out_unlock;
 
+       if (file_priv->master->lessor != NULL) {
+               DRM_DEBUG_LEASE("Attempt to drop lessee %d as master\n", file_priv->master->lessee_id);
+               ret = -EINVAL;
+               goto out_unlock;
+       }
+
        ret = 0;
        drm_drop_master(dev, file_priv);
 out_unlock: