diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-07-20 12:43:12 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-07-20 12:43:12 +0000 |
| commit | a776c5ec0464e264bba3f3a4794a067d3c667097 (patch) | |
| tree | 8a17a6e61d102009254ff94ecab32c697124b29d /linux/drm_drv.h | |
| parent | b35cba47d5e927c3ff1944fadef1816b9b1e1dd7 (diff) | |
first set of __user annotations from kernel (Al Viro)
Diffstat (limited to 'linux/drm_drv.h')
| -rw-r--r-- | linux/drm_drv.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/linux/drm_drv.h b/linux/drm_drv.h index 42831be0..706d762f 100644 --- a/linux/drm_drv.h +++ b/linux/drm_drv.h @@ -817,12 +817,11 @@ module_exit( drm_exit ); int DRM(version)( struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg ) { + drm_version_t __user *argp = (void __user *)arg; drm_version_t version; int len; - if ( copy_from_user( &version, - (drm_version_t *)arg, - sizeof(version) ) ) + if ( copy_from_user( &version, argp, sizeof(version) ) ) return -EFAULT; #define DRM_COPY( name, value ) \ @@ -842,9 +841,7 @@ int DRM(version)( struct inode *inode, struct file *filp, DRM_COPY( version.date, DRIVER_DATE ); DRM_COPY( version.desc, DRIVER_DESC ); - if ( copy_to_user( (drm_version_t *)arg, - &version, - sizeof(version) ) ) + if ( copy_to_user( argp, &version, sizeof(version) ) ) return -EFAULT; return 0; } @@ -1124,7 +1121,7 @@ int DRM(lock)( struct inode *inode, struct file *filp, ++priv->lock_count; - if ( copy_from_user( &lock, (drm_lock_t *)arg, sizeof(lock) ) ) + if ( copy_from_user( &lock, (drm_lock_t __user *)arg, sizeof(lock) ) ) return -EFAULT; if ( lock.context == DRM_KERNEL_CONTEXT ) { @@ -1237,7 +1234,7 @@ int DRM(unlock)( struct inode *inode, struct file *filp, drm_device_t *dev = priv->dev; drm_lock_t lock; - if ( copy_from_user( &lock, (drm_lock_t *)arg, sizeof(lock) ) ) + if ( copy_from_user( &lock, (drm_lock_t __user *)arg, sizeof(lock) ) ) return -EFAULT; if ( lock.context == DRM_KERNEL_CONTEXT ) { |