diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-04-20 09:32:50 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-04-20 10:04:28 +1000 |
| commit | 07f1c7a7f6736d9ec2eba57d209c5f48888d841e (patch) | |
| tree | 0f75684fa43612f4f91d7aaeb91273f91097418f | |
| parent | 6b0084266c1d4917ad9259759a1e7bd623cb3888 (diff) | |
| download | linux-3.10-07f1c7a7f6736d9ec2eba57d209c5f48888d841e.tar.gz linux-3.10-07f1c7a7f6736d9ec2eba57d209c5f48888d841e.tar.bz2 linux-3.10-07f1c7a7f6736d9ec2eba57d209c5f48888d841e.zip | |
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: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/drm_stub.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index 1b3e0ff57b4..ef878615c49 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -185,6 +185,9 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data, if (!file_priv->is_master) return -EINVAL; + if (!file_priv->minor->master) + return -EINVAL; + mutex_lock(&dev->struct_mutex); drm_master_put(&file_priv->minor->master); file_priv->is_master = 0; |