Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 012c6741 authored by Al Viro's avatar Al Viro
Browse files

switch compat_drm_version() to drm_ioctl_kernel() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ff22ff9e

drivers/gpu/drm/drm_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -143,3 +143,4 @@ static inline int drm_debugfs_crtc_crc_add(struct drm_crtc *crtc) 
	return 0;

}

#endif

drm_ioctl_t drm_version;

drivers/gpu/drm/drm_ioc32.c

+16 −26
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 


#include <drm/drmP.h>

#include "drm_legacy.h"

#include "drm_internal.h"



#define DRM_IOCTL_VERSION32		DRM_IOWR(0x00, drm_version32_t)

#define DRM_IOCTL_GET_UNIQUE32		DRM_IOWR(0x01, drm_unique32_t)
@@ -88,39 +89,28 @@ static int compat_drm_version(struct file *file, unsigned int cmd, 
			      unsigned long arg)

{

	drm_version32_t v32;

	struct drm_version __user *version;

	struct drm_version v;

	int err;



	if (copy_from_user(&v32, (void __user *)arg, sizeof(v32)))

		return -EFAULT;



	version = compat_alloc_user_space(sizeof(*version));

	if (!version)

		return -EFAULT;

	if (__put_user(v32.name_len, &version->name_len)

	    || __put_user((void __user *)(unsigned long)v32.name,

			  &version->name)

	    || __put_user(v32.date_len, &version->date_len)

	    || __put_user((void __user *)(unsigned long)v32.date,

			  &version->date)

	    || __put_user(v32.desc_len, &version->desc_len)

	    || __put_user((void __user *)(unsigned long)v32.desc,

			  &version->desc))

		return -EFAULT;



	err = drm_ioctl(file,

			DRM_IOCTL_VERSION, (unsigned long)version);

	v = (struct drm_version) {

		.name_len = v32.name_len,

		.name = compat_ptr(v32.name),

		.date_len = v32.date_len,

		.date = compat_ptr(v32.date),

		.desc_len = v32.desc_len,

		.desc = compat_ptr(v32.desc),

	};

	err = drm_ioctl_kernel(file, drm_version, &v,

			DRM_UNLOCKED|DRM_RENDER_ALLOW|DRM_CONTROL_ALLOW);

	if (err)

		return err;



	if (__get_user(v32.version_major, &version->version_major)

	    || __get_user(v32.version_minor, &version->version_minor)

	    || __get_user(v32.version_patchlevel, &version->version_patchlevel)

	    || __get_user(v32.name_len, &version->name_len)

	    || __get_user(v32.date_len, &version->date_len)

	    || __get_user(v32.desc_len, &version->desc_len))

		return -EFAULT;



	v32.version_major = v.version_major;

	v32.version_minor = v.version_minor;

	v32.version_patchlevel = v.version_patchlevel;

	if (copy_to_user((void __user *)arg, &v32, sizeof(v32)))

		return -EFAULT;

	return 0;
@@ -1081,7 +1071,7 @@ static struct { 
	char *name;

} drm_compat_ioctls[] = {

#define DRM_IOCTL32_DEF(n, f) [DRM_IOCTL_NR(n##32)] = {.fn = f, .name = #n}

	[DRM_IOCTL_NR(DRM_IOCTL_VERSION32)].fn = compat_drm_version,

	DRM_IOCTL32_DEF(DRM_IOCTL_VERSION, compat_drm_version),

	[DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)].fn = compat_drm_getunique,

	[DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)].fn = compat_drm_getmap,

	[DRM_IOCTL_NR(DRM_IOCTL_GET_CLIENT32)].fn = compat_drm_getclient,

drivers/gpu/drm/drm_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value) 
 *

 * Fills in the version information in \p arg.

 */

static int drm_version(struct drm_device *dev, void *data,

int drm_version(struct drm_device *dev, void *data,

		       struct drm_file *file_priv)

{

	struct drm_version *version = data;