Commit 7900c600 authored by Al Viro's avatar Al Viro

switch compat_drm_setsareactx() to drm_ioctl_kernel()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 8c9e4cfb
...@@ -502,21 +502,16 @@ static int compat_drm_setsareactx(struct file *file, unsigned int cmd, ...@@ -502,21 +502,16 @@ static int compat_drm_setsareactx(struct file *file, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
drm_ctx_priv_map32_t req32; drm_ctx_priv_map32_t req32;
struct drm_ctx_priv_map __user *request; struct drm_ctx_priv_map request;
drm_ctx_priv_map32_t __user *argp = (void __user *)arg; drm_ctx_priv_map32_t __user *argp = (void __user *)arg;
if (copy_from_user(&req32, argp, sizeof(req32))) if (copy_from_user(&req32, argp, sizeof(req32)))
return -EFAULT; return -EFAULT;
request = compat_alloc_user_space(sizeof(*request)); request.ctx_id = req32.ctx_id;
if (!request) request.handle = compat_ptr(req32.handle);
return -EFAULT; return drm_ioctl_kernel(file, drm_legacy_setsareactx, &request,
if (__put_user(req32.ctx_id, &request->ctx_id) DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY);
|| __put_user((void *)(unsigned long)req32.handle,
&request->handle))
return -EFAULT;
return drm_ioctl(file, DRM_IOCTL_SET_SAREA_CTX, (unsigned long)request);
} }
static int compat_drm_getsareactx(struct file *file, unsigned int cmd, static int compat_drm_getsareactx(struct file *file, unsigned int cmd,
...@@ -1011,7 +1006,7 @@ static struct { ...@@ -1011,7 +1006,7 @@ static struct {
[DRM_IOCTL_NR(DRM_IOCTL_MAP_BUFS32)].fn = compat_drm_mapbufs, [DRM_IOCTL_NR(DRM_IOCTL_MAP_BUFS32)].fn = compat_drm_mapbufs,
DRM_IOCTL32_DEF(DRM_IOCTL_FREE_BUFS, compat_drm_freebufs), DRM_IOCTL32_DEF(DRM_IOCTL_FREE_BUFS, compat_drm_freebufs),
[DRM_IOCTL_NR(DRM_IOCTL_RM_MAP32)].fn = compat_drm_rmmap, [DRM_IOCTL_NR(DRM_IOCTL_RM_MAP32)].fn = compat_drm_rmmap,
[DRM_IOCTL_NR(DRM_IOCTL_SET_SAREA_CTX32)].fn = compat_drm_setsareactx, DRM_IOCTL32_DEF(DRM_IOCTL_SET_SAREA_CTX, compat_drm_setsareactx),
[DRM_IOCTL_NR(DRM_IOCTL_GET_SAREA_CTX32)].fn = compat_drm_getsareactx, [DRM_IOCTL_NR(DRM_IOCTL_GET_SAREA_CTX32)].fn = compat_drm_getsareactx,
[DRM_IOCTL_NR(DRM_IOCTL_RES_CTX32)].fn = compat_drm_resctx, [DRM_IOCTL_NR(DRM_IOCTL_RES_CTX32)].fn = compat_drm_resctx,
[DRM_IOCTL_NR(DRM_IOCTL_DMA32)].fn = compat_drm_dma, [DRM_IOCTL_NR(DRM_IOCTL_DMA32)].fn = compat_drm_dma,
......
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