On Wed, Jul 23, 2014 at 05:26:45PM +0200, David Herrmann wrote:
> All that is left in drm_drv.c is ioctl management. Merge it into
> drm_ioctl.c so we have all ioctl management in one file (and the name is
> much more fitting).
>
> Maybe we should now rename drm_stub.c to drm_drv.c again?
>
> Signed-off-by: David Herrmann <dh.herrmann at gmail.com>
Ack on this one (with the fixup) and the previous patch, too lazy to
double-check it.
-Daniel
> ---
> drivers/gpu/drm/drm_drv.c | 412
> --------------------------------------------
> drivers/gpu/drm/drm_ioctl.c | 369 ++++++++++++++++++++++++++++++++++++++-
> 2 files changed, 361 insertions(+), 420 deletions(-)
> delete mode 100644 drivers/gpu/drm/drm_drv.c
>
> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> deleted file mode 100644
> index 190df83..0000000
> --- a/drivers/gpu/drm/drm_drv.c
> +++ /dev/null
> @@ -1,412 +0,0 @@
> -/**
> - * \file drm_drv.c
> - * Generic driver template
> - *
> - * \author Rickard E. (Rik) Faith <faith at valinux.com>
> - * \author Gareth Hughes <gareth at valinux.com>
> - *
> - * To use this template, you must at least define the following (samples
> - * given for the MGA driver):
> - *
> - * \code
> - * #define DRIVER_AUTHOR "VA Linux Systems, Inc."
> - *
> - * #define DRIVER_NAME "mga"
> - * #define DRIVER_DESC "Matrox G200/G400"
> - * #define DRIVER_DATE "20001127"
> - *
> - * #define drm_x mga_##x
> - * \endcode
> - */
> -
> -/*
> - * Created: Thu Nov 23 03:10:50 2000 by gareth at valinux.com
> - *
> - * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
> - * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
> - * All Rights Reserved.
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a
> - * copy of this software and associated documentation files (the "Software"),
> - * to deal in the Software without restriction, including without limitation
> - * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> - * and/or sell copies of the Software, and to permit persons to whom the
> - * Software is furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice (including the next
> - * paragraph) shall be included in all copies or substantial portions of the
> - * Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> - * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
> - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> - * OTHER DEALINGS IN THE SOFTWARE.
> - */
> -
> -#include <linux/debugfs.h>
> -#include <linux/slab.h>
> -#include <linux/export.h>
> -#include <drm/drmP.h>
> -#include <drm/drm_core.h>
> -
> -
> -static int drm_version(struct drm_device *dev, void *data,
> - struct drm_file *file_priv);
> -
> -#define DRM_IOCTL_DEF(ioctl, _func, _flags) \
> - [DRM_IOCTL_NR(ioctl)] = {.cmd = ioctl, .func = _func, .flags = _flags,
> .cmd_drv = 0, .name = #ioctl}
> -
> -/** Ioctl table */
> -static const struct drm_ioctl_desc drm_ioctls[] = {
> - DRM_IOCTL_DEF(DRM_IOCTL_VERSION, drm_version,
> DRM_UNLOCKED|DRM_RENDER_ALLOW),
> - DRM_IOCTL_DEF(DRM_IOCTL_GET_UNIQUE, drm_getunique, 0),
> - DRM_IOCTL_DEF(DRM_IOCTL_GET_MAGIC, drm_getmagic, 0),
> - DRM_IOCTL_DEF(DRM_IOCTL_IRQ_BUSID, drm_irq_by_busid,
> DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_GET_MAP, drm_getmap, DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_GET_CLIENT, drm_getclient, DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_GET_STATS, drm_getstats, DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_GET_CAP, drm_getcap,
> DRM_UNLOCKED|DRM_RENDER_ALLOW),
> - DRM_IOCTL_DEF(DRM_IOCTL_SET_CLIENT_CAP, drm_setclientcap, 0),
> - DRM_IOCTL_DEF(DRM_IOCTL_SET_VERSION, drm_setversion, DRM_MASTER),
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_SET_UNIQUE, drm_setunique,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_BLOCK, drm_noop,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_UNBLOCK, drm_noop,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_AUTH_MAGIC, drm_authmagic, DRM_AUTH|DRM_MASTER),
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_ADD_MAP, drm_addmap_ioctl,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_RM_MAP, drm_rmmap_ioctl, DRM_AUTH),
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_SET_SAREA_CTX, drm_setsareactx,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_GET_SAREA_CTX, drm_getsareactx, DRM_AUTH),
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_SET_MASTER, drm_setmaster_ioctl, DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_DROP_MASTER, drm_dropmaster_ioctl,
> DRM_ROOT_ONLY),
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_ADD_CTX, drm_addctx, DRM_AUTH|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_RM_CTX, drm_rmctx,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_MOD_CTX, drm_noop,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_GET_CTX, drm_getctx, DRM_AUTH),
> - DRM_IOCTL_DEF(DRM_IOCTL_SWITCH_CTX, drm_switchctx,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_NEW_CTX, drm_newctx,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_RES_CTX, drm_resctx, DRM_AUTH),
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_ADD_DRAW, drm_noop,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_RM_DRAW, drm_noop,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_LOCK, drm_lock, DRM_AUTH),
> - DRM_IOCTL_DEF(DRM_IOCTL_UNLOCK, drm_unlock, DRM_AUTH),
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_FINISH, drm_noop, DRM_AUTH),
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_ADD_BUFS, drm_addbufs,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_MARK_BUFS, drm_markbufs,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_INFO_BUFS, drm_infobufs, DRM_AUTH),
> - DRM_IOCTL_DEF(DRM_IOCTL_MAP_BUFS, drm_mapbufs, DRM_AUTH),
> - DRM_IOCTL_DEF(DRM_IOCTL_FREE_BUFS, drm_freebufs, DRM_AUTH),
> - DRM_IOCTL_DEF(DRM_IOCTL_DMA, drm_dma_ioctl, DRM_AUTH),
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_CONTROL, drm_control,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> -
> -#if __OS_HAS_AGP
> - DRM_IOCTL_DEF(DRM_IOCTL_AGP_ACQUIRE, drm_agp_acquire_ioctl,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_AGP_RELEASE, drm_agp_release_ioctl,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_AGP_ENABLE, drm_agp_enable_ioctl,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_AGP_INFO, drm_agp_info_ioctl, DRM_AUTH),
> - DRM_IOCTL_DEF(DRM_IOCTL_AGP_ALLOC, drm_agp_alloc_ioctl,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_AGP_FREE, drm_agp_free_ioctl,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_AGP_BIND, drm_agp_bind_ioctl,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_AGP_UNBIND, drm_agp_unbind_ioctl,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> -#endif
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_SG_ALLOC, drm_sg_alloc,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> - DRM_IOCTL_DEF(DRM_IOCTL_SG_FREE, drm_sg_free,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_WAIT_VBLANK, drm_wait_vblank, DRM_UNLOCKED),
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_MODESET_CTL, drm_modeset_ctl, 0),
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_UPDATE_DRAW, drm_noop,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_GEM_CLOSE, drm_gem_close_ioctl,
> DRM_UNLOCKED|DRM_RENDER_ALLOW),
> - DRM_IOCTL_DEF(DRM_IOCTL_GEM_FLINK, drm_gem_flink_ioctl,
> DRM_AUTH|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_GEM_OPEN, drm_gem_open_ioctl,
> DRM_AUTH|DRM_UNLOCKED),
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETRESOURCES, drm_mode_getresources,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_PRIME_HANDLE_TO_FD,
> drm_prime_handle_to_fd_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),
> - DRM_IOCTL_DEF(DRM_IOCTL_PRIME_FD_TO_HANDLE,
> drm_prime_fd_to_handle_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),
> -
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPLANERESOURCES, drm_mode_getplane_res,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCRTC, drm_mode_getcrtc,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETCRTC, drm_mode_setcrtc,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPLANE, drm_mode_getplane,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPLANE, drm_mode_setplane,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_CURSOR, drm_mode_cursor_ioctl,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETGAMMA, drm_mode_gamma_get_ioctl,
> DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETGAMMA, drm_mode_gamma_set_ioctl,
> DRM_MASTER|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETENCODER, drm_mode_getencoder,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCONNECTOR, drm_mode_getconnector,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_ATTACHMODE, drm_noop,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_DETACHMODE, drm_noop,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPERTY, drm_mode_getproperty_ioctl,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPROPERTY,
> drm_mode_connector_property_set_ioctl,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPBLOB, drm_mode_getblob_ioctl,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB2, drm_mode_addfb2,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_PAGE_FLIP, drm_mode_page_flip_ioctl,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_DIRTYFB, drm_mode_dirtyfb_ioctl,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_CREATE_DUMB, drm_mode_create_dumb_ioctl,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_MAP_DUMB, drm_mode_mmap_dumb_ioctl,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_DESTROY_DUMB, drm_mode_destroy_dumb_ioctl,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_OBJ_GETPROPERTIES,
> drm_mode_obj_get_properties_ioctl, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_OBJ_SETPROPERTY,
> drm_mode_obj_set_property_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_CURSOR2, drm_mode_cursor2_ioctl,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> -};
> -
> -#define DRM_CORE_IOCTL_COUNT ARRAY_SIZE( drm_ioctls )
> -
> -/**
> - * Copy and IOCTL return string to user space
> - */
> -static int drm_copy_field(char __user *buf, size_t *buf_len, const char
> *value)
> -{
> - int len;
> -
> - /* don't overflow userbuf */
> - len = strlen(value);
> - if (len > *buf_len)
> - len = *buf_len;
> -
> - /* let userspace know exact length of driver value (which could be
> - * larger than the userspace-supplied buffer) */
> - *buf_len = strlen(value);
> -
> - /* finally, try filling in the userbuf */
> - if (len && buf)
> - if (copy_to_user(buf, value, len))
> - return -EFAULT;
> - return 0;
> -}
> -
> -/**
> - * Get version information
> - *
> - * \param inode device inode.
> - * \param filp file pointer.
> - * \param cmd command.
> - * \param arg user argument, pointing to a drm_version structure.
> - * \return zero on success or negative number on failure.
> - *
> - * Fills in the version information in \p arg.
> - */
> -static int drm_version(struct drm_device *dev, void *data,
> - struct drm_file *file_priv)
> -{
> - struct drm_version *version = data;
> - int err;
> -
> - version->version_major = dev->driver->major;
> - version->version_minor = dev->driver->minor;
> - version->version_patchlevel = dev->driver->patchlevel;
> - err = drm_copy_field(version->name, &version->name_len,
> - dev->driver->name);
> - if (!err)
> - err = drm_copy_field(version->date, &version->date_len,
> - dev->driver->date);
> - if (!err)
> - err = drm_copy_field(version->desc, &version->desc_len,
> - dev->driver->desc);
> -
> - return err;
> -}
> -
> -/**
> - * drm_ioctl_permit - Check ioctl permissions against caller
> - *
> - * @flags: ioctl permission flags.
> - * @file_priv: Pointer to struct drm_file identifying the caller.
> - *
> - * Checks whether the caller is allowed to run an ioctl with the
> - * indicated permissions. If so, returns zero. Otherwise returns an
> - * error code suitable for ioctl return.
> - */
> -static int drm_ioctl_permit(u32 flags, struct drm_file *file_priv)
> -{
> - /* ROOT_ONLY is only for CAP_SYS_ADMIN */
> - if (unlikely((flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)))
> - return -EACCES;
> -
> - /* AUTH is only for authenticated or render client */
> - if (unlikely((flags & DRM_AUTH) && !drm_is_render_client(file_priv) &&
> - !file_priv->authenticated))
> - return -EACCES;
> -
> - /* MASTER is only for master or control clients */
> - if (unlikely((flags & DRM_MASTER) && !drm_is_master(file_priv) &&
> - !drm_is_control_client(file_priv)))
> - return -EACCES;
> -
> - /* Control clients must be explicitly allowed */
> - if (unlikely(!(flags & DRM_CONTROL_ALLOW) &&
> - drm_is_control_client(file_priv)))
> - return -EACCES;
> -
> - /* Render clients must be explicitly allowed */
> - if (unlikely(!(flags & DRM_RENDER_ALLOW) &&
> - drm_is_render_client(file_priv)))
> - return -EACCES;
> -
> - return 0;
> -}
> -
> -/**
> - * Called whenever a process performs an ioctl on /dev/drm.
> - *
> - * \param inode device inode.
> - * \param file_priv DRM file private.
> - * \param cmd command.
> - * \param arg user argument.
> - * \return zero on success or negative number on failure.
> - *
> - * Looks up the ioctl function in the ::ioctls table, checking for root
> - * previleges if so required, and dispatches to the respective function.
> - */
> -long drm_ioctl(struct file *filp,
> - unsigned int cmd, unsigned long arg)
> -{
> - struct drm_file *file_priv = filp->private_data;
> - struct drm_device *dev;
> - const struct drm_ioctl_desc *ioctl = NULL;
> - drm_ioctl_t *func;
> - unsigned int nr = DRM_IOCTL_NR(cmd);
> - int retcode = -EINVAL;
> - char stack_kdata[128];
> - char *kdata = NULL;
> - unsigned int usize, asize;
> -
> - dev = file_priv->minor->dev;
> -
> - if (drm_device_is_unplugged(dev))
> - return -ENODEV;
> -
> - if ((nr >= DRM_CORE_IOCTL_COUNT) &&
> - ((nr < DRM_COMMAND_BASE) || (nr >= DRM_COMMAND_END)))
> - goto err_i1;
> - if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END) &&
> - (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls)) {
> - u32 drv_size;
> - ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE];
> - drv_size = _IOC_SIZE(ioctl->cmd_drv);
> - usize = asize = _IOC_SIZE(cmd);
> - if (drv_size > asize)
> - asize = drv_size;
> - cmd = ioctl->cmd_drv;
> - }
> - else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE)) {
> - u32 drv_size;
> -
> - ioctl = &drm_ioctls[nr];
> -
> - drv_size = _IOC_SIZE(ioctl->cmd);
> - usize = asize = _IOC_SIZE(cmd);
> - if (drv_size > asize)
> - asize = drv_size;
> -
> - cmd = ioctl->cmd;
> - } else
> - goto err_i1;
> -
> - DRM_DEBUG("pid=%d, dev=0x%lx, auth=%d, %s\n",
> - task_pid_nr(current),
> - (long)old_encode_dev(file_priv->minor->kdev->devt),
> - file_priv->authenticated, ioctl->name);
> -
> - /* Do not trust userspace, use our own definition */
> - func = ioctl->func;
> -
> - if (unlikely(!func)) {
> - DRM_DEBUG("no function\n");
> - retcode = -EINVAL;
> - goto err_i1;
> - }
> -
> - retcode = drm_ioctl_permit(ioctl->flags, file_priv);
> - if (unlikely(retcode))
> - goto err_i1;
> -
> - if (cmd & (IOC_IN | IOC_OUT)) {
> - if (asize <= sizeof(stack_kdata)) {
> - kdata = stack_kdata;
> - } else {
> - kdata = kmalloc(asize, GFP_KERNEL);
> - if (!kdata) {
> - retcode = -ENOMEM;
> - goto err_i1;
> - }
> - }
> - if (asize > usize)
> - memset(kdata + usize, 0, asize - usize);
> - }
> -
> - if (cmd & IOC_IN) {
> - if (copy_from_user(kdata, (void __user *)arg,
> - usize) != 0) {
> - retcode = -EFAULT;
> - goto err_i1;
> - }
> - } else if (cmd & IOC_OUT) {
> - memset(kdata, 0, usize);
> - }
> -
> - if (ioctl->flags & DRM_UNLOCKED)
> - retcode = func(dev, kdata, file_priv);
> - else {
> - mutex_lock(&drm_global_mutex);
> - retcode = func(dev, kdata, file_priv);
> - mutex_unlock(&drm_global_mutex);
> - }
> -
> - if (cmd & IOC_OUT) {
> - if (copy_to_user((void __user *)arg, kdata,
> - usize) != 0)
> - retcode = -EFAULT;
> - }
> -
> - err_i1:
> - if (!ioctl)
> - DRM_DEBUG("invalid ioctl: pid=%d, dev=0x%lx, auth=%d,
> cmd=0x%02x, nr=0x%02x\n",
> - task_pid_nr(current),
> - (long)old_encode_dev(file_priv->minor->kdev->devt),
> - file_priv->authenticated, cmd, nr);
> -
> - if (kdata != stack_kdata)
> - kfree(kdata);
> - if (retcode)
> - DRM_DEBUG("ret = %d\n", retcode);
> - return retcode;
> -}
> -EXPORT_SYMBOL(drm_ioctl);
> -
> -/**
> - * drm_ioctl_flags - Check for core ioctl and return ioctl permission flags
> - *
> - * @nr: Ioctl number.
> - * @flags: Where to return the ioctl permission flags
> - */
> -bool drm_ioctl_flags(unsigned int nr, unsigned int *flags)
> -{
> - if ((nr >= DRM_COMMAND_END && nr < DRM_CORE_IOCTL_COUNT) ||
> - (nr < DRM_COMMAND_BASE)) {
> - *flags = drm_ioctls[nr].flags;
> - return true;
> - }
> -
> - return false;
> -}
> -EXPORT_SYMBOL(drm_ioctl_flags);
> diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
> index ad66f96..22ca14d 100644
> --- a/drivers/gpu/drm/drm_ioctl.c
> +++ b/drivers/gpu/drm/drm_ioctl.c
> @@ -1,11 +1,3 @@
> -/**
> - * \file drm_ioctl.c
> - * IOCTL processing for DRM
> - *
> - * \author Rickard E. (Rik) Faith <faith at valinux.com>
> - * \author Gareth Hughes <gareth at valinux.com>
> - */
> -
> /*
> * Created: Fri Jan 8 09:01:26 1999 by faith at valinux.com
> *
> @@ -13,6 +5,9 @@
> * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
> * All Rights Reserved.
> *
> + * Author Rickard E. (Rik) Faith <faith at valinux.com>
> + * Author Gareth Hughes <gareth at valinux.com>
> + *
> * Permission is hereby granted, free of charge, to any person obtaining a
> * copy of this software and associated documentation files (the "Software"),
> * to deal in the Software without restriction, including without limitation
> @@ -42,6 +37,124 @@
> #include <asm/mtrr.h>
> #endif
>
> +static int drm_version(struct drm_device *dev, void *data,
> + struct drm_file *file_priv);
> +
> +#define DRM_IOCTL_DEF(ioctl, _func, _flags) \
> + [DRM_IOCTL_NR(ioctl)] = {.cmd = ioctl, .func = _func, .flags = _flags,
> .cmd_drv = 0, .name = #ioctl}
> +
> +/** Ioctl table */
> +static const struct drm_ioctl_desc drm_ioctls[] = {
> + DRM_IOCTL_DEF(DRM_IOCTL_VERSION, drm_version,
> DRM_UNLOCKED|DRM_RENDER_ALLOW),
> + DRM_IOCTL_DEF(DRM_IOCTL_GET_UNIQUE, drm_getunique, 0),
> + DRM_IOCTL_DEF(DRM_IOCTL_GET_MAGIC, drm_getmagic, 0),
> + DRM_IOCTL_DEF(DRM_IOCTL_IRQ_BUSID, drm_irq_by_busid,
> DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_GET_MAP, drm_getmap, DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_GET_CLIENT, drm_getclient, DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_GET_STATS, drm_getstats, DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_GET_CAP, drm_getcap,
> DRM_UNLOCKED|DRM_RENDER_ALLOW),
> + DRM_IOCTL_DEF(DRM_IOCTL_SET_CLIENT_CAP, drm_setclientcap, 0),
> + DRM_IOCTL_DEF(DRM_IOCTL_SET_VERSION, drm_setversion, DRM_MASTER),
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_SET_UNIQUE, drm_setunique,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_BLOCK, drm_noop,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_UNBLOCK, drm_noop,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_AUTH_MAGIC, drm_authmagic, DRM_AUTH|DRM_MASTER),
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_ADD_MAP, drm_addmap_ioctl,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_RM_MAP, drm_rmmap_ioctl, DRM_AUTH),
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_SET_SAREA_CTX, drm_setsareactx,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_GET_SAREA_CTX, drm_getsareactx, DRM_AUTH),
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_SET_MASTER, drm_setmaster_ioctl, DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_DROP_MASTER, drm_dropmaster_ioctl,
> DRM_ROOT_ONLY),
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_ADD_CTX, drm_addctx, DRM_AUTH|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_RM_CTX, drm_rmctx,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_MOD_CTX, drm_noop,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_GET_CTX, drm_getctx, DRM_AUTH),
> + DRM_IOCTL_DEF(DRM_IOCTL_SWITCH_CTX, drm_switchctx,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_NEW_CTX, drm_newctx,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_RES_CTX, drm_resctx, DRM_AUTH),
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_ADD_DRAW, drm_noop,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_RM_DRAW, drm_noop,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_LOCK, drm_lock, DRM_AUTH),
> + DRM_IOCTL_DEF(DRM_IOCTL_UNLOCK, drm_unlock, DRM_AUTH),
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_FINISH, drm_noop, DRM_AUTH),
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_ADD_BUFS, drm_addbufs,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_MARK_BUFS, drm_markbufs,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_INFO_BUFS, drm_infobufs, DRM_AUTH),
> + DRM_IOCTL_DEF(DRM_IOCTL_MAP_BUFS, drm_mapbufs, DRM_AUTH),
> + DRM_IOCTL_DEF(DRM_IOCTL_FREE_BUFS, drm_freebufs, DRM_AUTH),
> + DRM_IOCTL_DEF(DRM_IOCTL_DMA, drm_dma_ioctl, DRM_AUTH),
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_CONTROL, drm_control,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> +
> +#if __OS_HAS_AGP
> + DRM_IOCTL_DEF(DRM_IOCTL_AGP_ACQUIRE, drm_agp_acquire_ioctl,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_AGP_RELEASE, drm_agp_release_ioctl,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_AGP_ENABLE, drm_agp_enable_ioctl,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_AGP_INFO, drm_agp_info_ioctl, DRM_AUTH),
> + DRM_IOCTL_DEF(DRM_IOCTL_AGP_ALLOC, drm_agp_alloc_ioctl,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_AGP_FREE, drm_agp_free_ioctl,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_AGP_BIND, drm_agp_bind_ioctl,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_AGP_UNBIND, drm_agp_unbind_ioctl,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> +#endif
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_SG_ALLOC, drm_sg_alloc,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> + DRM_IOCTL_DEF(DRM_IOCTL_SG_FREE, drm_sg_free,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_WAIT_VBLANK, drm_wait_vblank, DRM_UNLOCKED),
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_MODESET_CTL, drm_modeset_ctl, 0),
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_UPDATE_DRAW, drm_noop,
> DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_GEM_CLOSE, drm_gem_close_ioctl,
> DRM_UNLOCKED|DRM_RENDER_ALLOW),
> + DRM_IOCTL_DEF(DRM_IOCTL_GEM_FLINK, drm_gem_flink_ioctl,
> DRM_AUTH|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_GEM_OPEN, drm_gem_open_ioctl,
> DRM_AUTH|DRM_UNLOCKED),
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETRESOURCES, drm_mode_getresources,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_PRIME_HANDLE_TO_FD,
> drm_prime_handle_to_fd_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),
> + DRM_IOCTL_DEF(DRM_IOCTL_PRIME_FD_TO_HANDLE,
> drm_prime_fd_to_handle_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),
> +
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPLANERESOURCES, drm_mode_getplane_res,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCRTC, drm_mode_getcrtc,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETCRTC, drm_mode_setcrtc,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPLANE, drm_mode_getplane,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPLANE, drm_mode_setplane,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_CURSOR, drm_mode_cursor_ioctl,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETGAMMA, drm_mode_gamma_get_ioctl,
> DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETGAMMA, drm_mode_gamma_set_ioctl,
> DRM_MASTER|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETENCODER, drm_mode_getencoder,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCONNECTOR, drm_mode_getconnector,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_ATTACHMODE, drm_noop,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_DETACHMODE, drm_noop,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPERTY, drm_mode_getproperty_ioctl,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPROPERTY,
> drm_mode_connector_property_set_ioctl,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPBLOB, drm_mode_getblob_ioctl,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB2, drm_mode_addfb2,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_PAGE_FLIP, drm_mode_page_flip_ioctl,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_DIRTYFB, drm_mode_dirtyfb_ioctl,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_CREATE_DUMB, drm_mode_create_dumb_ioctl,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_MAP_DUMB, drm_mode_mmap_dumb_ioctl,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_DESTROY_DUMB, drm_mode_destroy_dumb_ioctl,
> DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_OBJ_GETPROPERTIES,
> drm_mode_obj_get_properties_ioctl, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_OBJ_SETPROPERTY,
> drm_mode_obj_set_property_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_CURSOR2, drm_mode_cursor2_ioctl,
> DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
> +};
> +
> +#define DRM_CORE_IOCTL_COUNT ARRAY_SIZE( drm_ioctls )
> +
> /**
> * Get the bus id.
> *
> @@ -415,3 +528,243 @@ int drm_noop(struct drm_device *dev, void *data,
> return 0;
> }
> EXPORT_SYMBOL(drm_noop);
> +
> +/**
> + * Copy and IOCTL return string to user space
> + */
> +static int drm_copy_field(char __user *buf, size_t *buf_len, const char
> *value)
> +{
> + int len;
> +
> + /* don't overflow userbuf */
> + len = strlen(value);
> + if (len > *buf_len)
> + len = *buf_len;
> +
> + /* let userspace know exact length of driver value (which could be
> + * larger than the userspace-supplied buffer) */
> + *buf_len = strlen(value);
> +
> + /* finally, try filling in the userbuf */
> + if (len && buf)
> + if (copy_to_user(buf, value, len))
> + return -EFAULT;
> + return 0;
> +}
> +
> +/**
> + * Get version information
> + *
> + * \param inode device inode.
> + * \param filp file pointer.
> + * \param cmd command.
> + * \param arg user argument, pointing to a drm_version structure.
> + * \return zero on success or negative number on failure.
> + *
> + * Fills in the version information in \p arg.
> + */
> +static int drm_version(struct drm_device *dev, void *data,
> + struct drm_file *file_priv)
> +{
> + struct drm_version *version = data;
> + int err;
> +
> + version->version_major = dev->driver->major;
> + version->version_minor = dev->driver->minor;
> + version->version_patchlevel = dev->driver->patchlevel;
> + err = drm_copy_field(version->name, &version->name_len,
> + dev->driver->name);
> + if (!err)
> + err = drm_copy_field(version->date, &version->date_len,
> + dev->driver->date);
> + if (!err)
> + err = drm_copy_field(version->desc, &version->desc_len,
> + dev->driver->desc);
> +
> + return err;
> +}
> +
> +/**
> + * drm_ioctl_permit - Check ioctl permissions against caller
> + *
> + * @flags: ioctl permission flags.
> + * @file_priv: Pointer to struct drm_file identifying the caller.
> + *
> + * Checks whether the caller is allowed to run an ioctl with the
> + * indicated permissions. If so, returns zero. Otherwise returns an
> + * error code suitable for ioctl return.
> + */
> +static int drm_ioctl_permit(u32 flags, struct drm_file *file_priv)
> +{
> + /* ROOT_ONLY is only for CAP_SYS_ADMIN */
> + if (unlikely((flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)))
> + return -EACCES;
> +
> + /* AUTH is only for authenticated or render client */
> + if (unlikely((flags & DRM_AUTH) && !drm_is_render_client(file_priv) &&
> + !file_priv->authenticated))
> + return -EACCES;
> +
> + /* MASTER is only for master or control clients */
> + if (unlikely((flags & DRM_MASTER) && !drm_is_master(file_priv) &&
> + !drm_is_control_client(file_priv)))
> + return -EACCES;
> +
> + /* Control clients must be explicitly allowed */
> + if (unlikely(!(flags & DRM_CONTROL_ALLOW) &&
> + drm_is_control_client(file_priv)))
> + return -EACCES;
> +
> + /* Render clients must be explicitly allowed */
> + if (unlikely(!(flags & DRM_RENDER_ALLOW) &&
> + drm_is_render_client(file_priv)))
> + return -EACCES;
> +
> + return 0;
> +}
> +
> +/**
> + * Called whenever a process performs an ioctl on /dev/drm.
> + *
> + * \param inode device inode.
> + * \param file_priv DRM file private.
> + * \param cmd command.
> + * \param arg user argument.
> + * \return zero on success or negative number on failure.
> + *
> + * Looks up the ioctl function in the ::ioctls table, checking for root
> + * previleges if so required, and dispatches to the respective function.
> + */
> +long drm_ioctl(struct file *filp,
> + unsigned int cmd, unsigned long arg)
> +{
> + struct drm_file *file_priv = filp->private_data;
> + struct drm_device *dev;
> + const struct drm_ioctl_desc *ioctl = NULL;
> + drm_ioctl_t *func;
> + unsigned int nr = DRM_IOCTL_NR(cmd);
> + int retcode = -EINVAL;
> + char stack_kdata[128];
> + char *kdata = NULL;
> + unsigned int usize, asize;
> +
> + dev = file_priv->minor->dev;
> +
> + if (drm_device_is_unplugged(dev))
> + return -ENODEV;
> +
> + if ((nr >= DRM_CORE_IOCTL_COUNT) &&
> + ((nr < DRM_COMMAND_BASE) || (nr >= DRM_COMMAND_END)))
> + goto err_i1;
> + if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END) &&
> + (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls)) {
> + u32 drv_size;
> + ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE];
> + drv_size = _IOC_SIZE(ioctl->cmd_drv);
> + usize = asize = _IOC_SIZE(cmd);
> + if (drv_size > asize)
> + asize = drv_size;
> + cmd = ioctl->cmd_drv;
> + }
> + else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE)) {
> + u32 drv_size;
> +
> + ioctl = &drm_ioctls[nr];
> +
> + drv_size = _IOC_SIZE(ioctl->cmd);
> + usize = asize = _IOC_SIZE(cmd);
> + if (drv_size > asize)
> + asize = drv_size;
> +
> + cmd = ioctl->cmd;
> + } else
> + goto err_i1;
> +
> + DRM_DEBUG("pid=%d, dev=0x%lx, auth=%d, %s\n",
> + task_pid_nr(current),
> + (long)old_encode_dev(file_priv->minor->kdev->devt),
> + file_priv->authenticated, ioctl->name);
> +
> + /* Do not trust userspace, use our own definition */
> + func = ioctl->func;
> +
> + if (unlikely(!func)) {
> + DRM_DEBUG("no function\n");
> + retcode = -EINVAL;
> + goto err_i1;
> + }
> +
> + retcode = drm_ioctl_permit(ioctl->flags, file_priv);
> + if (unlikely(retcode))
> + goto err_i1;
> +
> + if (cmd & (IOC_IN | IOC_OUT)) {
> + if (asize <= sizeof(stack_kdata)) {
> + kdata = stack_kdata;
> + } else {
> + kdata = kmalloc(asize, GFP_KERNEL);
> + if (!kdata) {
> + retcode = -ENOMEM;
> + goto err_i1;
> + }
> + }
> + if (asize > usize)
> + memset(kdata + usize, 0, asize - usize);
> + }
> +
> + if (cmd & IOC_IN) {
> + if (copy_from_user(kdata, (void __user *)arg,
> + usize) != 0) {
> + retcode = -EFAULT;
> + goto err_i1;
> + }
> + } else if (cmd & IOC_OUT) {
> + memset(kdata, 0, usize);
> + }
> +
> + if (ioctl->flags & DRM_UNLOCKED)
> + retcode = func(dev, kdata, file_priv);
> + else {
> + mutex_lock(&drm_global_mutex);
> + retcode = func(dev, kdata, file_priv);
> + mutex_unlock(&drm_global_mutex);
> + }
> +
> + if (cmd & IOC_OUT) {
> + if (copy_to_user((void __user *)arg, kdata,
> + usize) != 0)
> + retcode = -EFAULT;
> + }
> +
> + err_i1:
> + if (!ioctl)
> + DRM_DEBUG("invalid ioctl: pid=%d, dev=0x%lx, auth=%d,
> cmd=0x%02x, nr=0x%02x\n",
> + task_pid_nr(current),
> + (long)old_encode_dev(file_priv->minor->kdev->devt),
> + file_priv->authenticated, cmd, nr);
> +
> + if (kdata != stack_kdata)
> + kfree(kdata);
> + if (retcode)
> + DRM_DEBUG("ret = %d\n", retcode);
> + return retcode;
> +}
> +EXPORT_SYMBOL(drm_ioctl);
> +
> +/**
> + * drm_ioctl_flags - Check for core ioctl and return ioctl permission flags
> + *
> + * @nr: Ioctl number.
> + * @flags: Where to return the ioctl permission flags
> + */
> +bool drm_ioctl_flags(unsigned int nr, unsigned int *flags)
> +{
> + if ((nr >= DRM_COMMAND_END && nr < DRM_CORE_IOCTL_COUNT) ||
> + (nr < DRM_COMMAND_BASE)) {
> + *flags = drm_ioctls[nr].flags;
> + return true;
> + }
> +
> + return false;
> +}
> +EXPORT_SYMBOL(drm_ioctl_flags);
> --
> 2.0.2
>
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
