Commit 17e3dade authored by Al Viro's avatar Al Viro

switch compat_drm_getunique() to drm_ioctl_kernel()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 012c6741
...@@ -144,3 +144,4 @@ static inline int drm_debugfs_crtc_crc_add(struct drm_crtc *crtc) ...@@ -144,3 +144,4 @@ static inline int drm_debugfs_crtc_crc_add(struct drm_crtc *crtc)
} }
#endif #endif
drm_ioctl_t drm_version; drm_ioctl_t drm_version;
drm_ioctl_t drm_getunique;
...@@ -125,26 +125,21 @@ static int compat_drm_getunique(struct file *file, unsigned int cmd, ...@@ -125,26 +125,21 @@ static int compat_drm_getunique(struct file *file, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
drm_unique32_t uq32; drm_unique32_t uq32;
struct drm_unique __user *u; struct drm_unique uq;
int err; int err;
if (copy_from_user(&uq32, (void __user *)arg, sizeof(uq32))) if (copy_from_user(&uq32, (void __user *)arg, sizeof(uq32)))
return -EFAULT; return -EFAULT;
uq = (struct drm_unique){
.unique_len = uq32.unique_len,
.unique = compat_ptr(uq32.unique),
};
u = compat_alloc_user_space(sizeof(*u)); err = drm_ioctl_kernel(file, drm_getunique, &uq, DRM_UNLOCKED);
if (!u)
return -EFAULT;
if (__put_user(uq32.unique_len, &u->unique_len)
|| __put_user((void __user *)(unsigned long)uq32.unique,
&u->unique))
return -EFAULT;
err = drm_ioctl(file, DRM_IOCTL_GET_UNIQUE, (unsigned long)u);
if (err) if (err)
return err; return err;
if (__get_user(uq32.unique_len, &u->unique_len)) uq32.unique_len = uq.unique_len;
return -EFAULT;
if (copy_to_user((void __user *)arg, &uq32, sizeof(uq32))) if (copy_to_user((void __user *)arg, &uq32, sizeof(uq32)))
return -EFAULT; return -EFAULT;
return 0; return 0;
...@@ -1072,7 +1067,7 @@ static struct { ...@@ -1072,7 +1067,7 @@ static struct {
} drm_compat_ioctls[] = { } drm_compat_ioctls[] = {
#define DRM_IOCTL32_DEF(n, f) [DRM_IOCTL_NR(n##32)] = {.fn = f, .name = #n} #define DRM_IOCTL32_DEF(n, f) [DRM_IOCTL_NR(n##32)] = {.fn = f, .name = #n}
DRM_IOCTL32_DEF(DRM_IOCTL_VERSION, compat_drm_version), DRM_IOCTL32_DEF(DRM_IOCTL_VERSION, compat_drm_version),
[DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)].fn = compat_drm_getunique, DRM_IOCTL32_DEF(DRM_IOCTL_GET_UNIQUE, compat_drm_getunique),
[DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)].fn = compat_drm_getmap, [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)].fn = compat_drm_getmap,
[DRM_IOCTL_NR(DRM_IOCTL_GET_CLIENT32)].fn = compat_drm_getclient, [DRM_IOCTL_NR(DRM_IOCTL_GET_CLIENT32)].fn = compat_drm_getclient,
[DRM_IOCTL_NR(DRM_IOCTL_GET_STATS32)].fn = compat_drm_getstats, [DRM_IOCTL_NR(DRM_IOCTL_GET_STATS32)].fn = compat_drm_getstats,
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
* *
* Copies the bus id from drm_device::unique into user space. * Copies the bus id from drm_device::unique into user space.
*/ */
static int drm_getunique(struct drm_device *dev, void *data, int drm_getunique(struct drm_device *dev, void *data,
struct drm_file *file_priv) struct drm_file *file_priv)
{ {
struct drm_unique *u = data; struct drm_unique *u = data;
......
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