switch compat_drm_getclient() to drm_ioctl_kernel()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
index 7299ba01bd99498e9807d122e8bc4299b1808b9d..14dfa9c83d1d71e59c27889f2b1b91c403c7138d 100644 (file)
--- a/drivers/gpu/drm/drm_internal.h
+++ b/drivers/gpu/drm/drm_internal.h
@@ -145,3 +145,4 @@ static inline int drm_debugfs_crtc_crc_add(struct drm_crtc *crtc)
 #endif
 drm_ioctl_t drm_version;
 drm_ioctl_t drm_getunique;
+drm_ioctl_t drm_getclient;

diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
index 0be62f20e524ec1082cda0753cdef1ed539ba677..7f36cbe066da00785a8ac2077ea412505a889a35 100644 (file)
--- a/drivers/gpu/drm/drm_ioc32.c
+++ b/drivers/gpu/drm/drm_ioc32.c
@@ -263,29 +263,24 @@ static int compat_drm_getclient(struct file *file, unsigned int cmd,
 {
        drm_client32_t c32;
        drm_client32_t __user *argp = (void __user *)arg;
-       struct drm_client __user *client;
-       int idx, err;
+       struct drm_client client;
+       int err;
 
-       if (get_user(idx, &argp->idx))
+       if (copy_from_user(&c32, argp, sizeof(c32)))
                return -EFAULT;
 
-       client = compat_alloc_user_space(sizeof(*client));
-       if (!client)
-               return -EFAULT;
-       if (__put_user(idx, &client->idx))
-               return -EFAULT;
+       client.idx = c32.idx;
 
-       err = drm_ioctl(file, DRM_IOCTL_GET_CLIENT, (unsigned long)client);
+       err = drm_ioctl_kernel(file, drm_getclient, &client, DRM_UNLOCKED);
        if (err)
                return err;
 
-       if (__get_user(c32.idx, &client->idx)
-           || __get_user(c32.auth, &client->auth)
-           || __get_user(c32.pid, &client->pid)
-           || __get_user(c32.uid, &client->uid)
-           || __get_user(c32.magic, &client->magic)
-           || __get_user(c32.iocs, &client->iocs))
-               return -EFAULT;
+       c32.idx = client.idx;
+       c32.auth = client.auth;
+       c32.pid = client.pid;
+       c32.uid = client.uid;
+       c32.magic = client.magic;
+       c32.iocs = client.iocs;
 
        if (copy_to_user(argp, &c32, sizeof(c32)))
                return -EFAULT;
@@ -1037,7 +1032,7 @@ static struct {
        DRM_IOCTL32_DEF(DRM_IOCTL_VERSION, compat_drm_version),
        DRM_IOCTL32_DEF(DRM_IOCTL_GET_UNIQUE, compat_drm_getunique),
        DRM_IOCTL32_DEF(DRM_IOCTL_GET_MAP, compat_drm_getmap),
-       [DRM_IOCTL_NR(DRM_IOCTL_GET_CLIENT32)].fn = compat_drm_getclient,
+       DRM_IOCTL32_DEF(DRM_IOCTL_GET_CLIENT, compat_drm_getclient),
        [DRM_IOCTL_NR(DRM_IOCTL_GET_STATS32)].fn = compat_drm_getstats,
        DRM_IOCTL32_DEF(DRM_IOCTL_SET_UNIQUE, compat_drm_setunique),
        [DRM_IOCTL_NR(DRM_IOCTL_ADD_MAP32)].fn = compat_drm_addmap,

diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
index a7d4d6253096df3393ea123ab1b7062985de523f..8a8b3075b8b27c61e40cc89335c5d629bc5f8fe2 100644 (file)
--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
@@ -172,7 +172,7 @@ static int drm_set_busid(struct drm_device *dev, struct drm_file *file_priv)
  * Searches for the client with the specified index and copies its information
  * into userspace
  */
-static int drm_getclient(struct drm_device *dev, void *data,
+int drm_getclient(struct drm_device *dev, void *data,
                  struct drm_file *file_priv)
 {
        struct drm_client *client = data;