diff options
| author | Jonas Bonn <jonas@southpole.se> | 2009-04-24 01:05:02 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-04-24 01:05:02 -0400 |
| commit | 59738d5c974d81b566cb53c203f5db268b7b3545 (patch) | |
| tree | 7322de299e0a3e3335e8ed0d96fa3b1a63c90dfc /drivers | |
| parent | c964b129425c98cb37da365e772bdbe5281f3a05 (diff) | |
drm: add control node checks missing from kms merge
This line that checks the DRM_CONTROL_ALLOW flag was missed from the KMS
merge. Re-add the check on the IOCTL, as this is currently the only use of
this flag.
Signed-off-by: Jonas Bonn <jonas@southpole.se>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/drm_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index c4ada8b6295b..f01def16a669 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c | |||
| @@ -456,7 +456,8 @@ int drm_ioctl(struct inode *inode, struct file *filp, | |||
| 456 | retcode = -EINVAL; | 456 | retcode = -EINVAL; |
| 457 | } else if (((ioctl->flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)) || | 457 | } else if (((ioctl->flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)) || |
| 458 | ((ioctl->flags & DRM_AUTH) && !file_priv->authenticated) || | 458 | ((ioctl->flags & DRM_AUTH) && !file_priv->authenticated) || |
| 459 | ((ioctl->flags & DRM_MASTER) && !file_priv->is_master)) { | 459 | ((ioctl->flags & DRM_MASTER) && !file_priv->is_master) || |
| 460 | (!(ioctl->flags & DRM_CONTROL_ALLOW) && (file_priv->minor->type == DRM_MINOR_CONTROL))) { | ||
| 460 | retcode = -EACCES; | 461 | retcode = -EACCES; |
| 461 | } else { | 462 | } else { |
| 462 | if (cmd & (IOC_IN | IOC_OUT)) { | 463 | if (cmd & (IOC_IN | IOC_OUT)) { |