Commit 07f1c7a7 authored by Dave Airlie's avatar Dave Airlie

drm: check for minor master before allowing drop master.

When fast user switching a lot eventually we get to the point,
where we were checking for the wrong thing in this function.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 6b008426
...@@ -185,6 +185,9 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data, ...@@ -185,6 +185,9 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
if (!file_priv->is_master) if (!file_priv->is_master)
return -EINVAL; return -EINVAL;
if (!file_priv->minor->master)
return -EINVAL;
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);
drm_master_put(&file_priv->minor->master); drm_master_put(&file_priv->minor->master);
file_priv->is_master = 0; file_priv->is_master = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment