public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-17 04:04:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/qxl: fix __user annotations

Browse source 
Drop them from u64 fields, tag local variables correctly instead.
While being at it switch the code to use u64_to_user_ptr().

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170620113916.6967-2-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2017-06-20 13:39:14 +02:00
parent 8814b40bf6
commit 6545135a5e
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/gpu/drm/qxl/qxl_ioctl.c
View file

@ -163,7 +163,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
return -EINVAL; return -EINVAL;
if (!access_ok(VERIFY_READ, if (!access_ok(VERIFY_READ,
(void *)(unsigned long)cmd->command, u64_to_user_ptr(cmd->command),
cmd->command_size)) cmd->command_size))
return -EFAULT; return -EFAULT;
@ -183,7 +183,9 @@ static int qxl_process_single_command(struct qxl_device *qdev,
/* TODO copy slow path code from i915 */ /* TODO copy slow path code from i915 */
fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE)); fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
unwritten = __copy_from_user_inatomic_nocache(fb_cmd + sizeof(union qxl_release_info) + (release->release_offset & ~PAGE_SIZE), (void *)(unsigned long)cmd->command, cmd->command_size); unwritten = __copy_from_user_inatomic_nocache
(fb_cmd + sizeof(union qxl_release_info) + (release->release_offset & ~PAGE_SIZE),
u64_to_user_ptr(cmd->command), cmd->command_size);
{ {
struct qxl_drawable *draw = fb_cmd; struct qxl_drawable *draw = fb_cmd;
@ -201,10 +203,9 @@ static int qxl_process_single_command(struct qxl_device *qdev,
num_relocs = 0; num_relocs = 0;
for (i = 0; i < cmd->relocs_num; ++i) { for (i = 0; i < cmd->relocs_num; ++i) {
struct drm_qxl_reloc reloc; struct drm_qxl_reloc reloc;
struct drm_qxl_reloc __user *u = u64_to_user_ptr(cmd->relocs);
if (copy_from_user(&reloc, if (copy_from_user(&reloc, u + i, sizeof(reloc))) {
&((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
sizeof(reloc))) {
ret = -EFAULT; ret = -EFAULT;
goto out_free_bos; goto out_free_bos;
} }
@ -282,10 +283,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) { for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
struct drm_qxl_command *commands = struct drm_qxl_command __user *commands =
(struct drm_qxl_command *)(uintptr_t)execbuffer->commands; u64_to_user_ptr(execbuffer->commands);
if (copy_from_user(&user_cmd, &commands[cmd_num], if (copy_from_user(&user_cmd, commands + cmd_num,
sizeof(user_cmd))) sizeof(user_cmd)))
return -EFAULT; return -EFAULT;

6
include/uapi/drm/qxl_drm.h
View file

@ -80,8 +80,8 @@ struct drm_qxl_reloc {
}; };
struct drm_qxl_command { struct drm_qxl_command {
__u64 __user command; /* void* */ __u64 command; /* void* */
__u64 __user relocs; /* struct drm_qxl_reloc* */ __u64 relocs; /* struct drm_qxl_reloc* */
__u32 type; __u32 type;
__u32 command_size; __u32 command_size;
__u32 relocs_num; __u32 relocs_num;
@ -91,7 +91,7 @@ struct drm_qxl_command {
struct drm_qxl_execbuffer { struct drm_qxl_execbuffer {
__u32 flags; /* for future use */ __u32 flags; /* for future use */
__u32 commands_num; __u32 commands_num;
__u64 __user commands; /* struct drm_qxl_command* */ __u64 commands; /* struct drm_qxl_command* */
}; };
struct drm_qxl_update_area { struct drm_qxl_update_area {