Skip to content

L
linux
Commit 56edc4e3 authored by Todd Poynor's avatar Todd Poynor Committed by Greg Kroah-Hartman
Browse files
Options

staging: gasket: common ioctls add __user annotations 

Add __user annotation to gasket common ioctl pointer arguments for
sparse checking.
Reported-by: default avatarDmitry Torokhov <dtor@chromium.org>
Signed-off-by: default avatarZhongze Hu <frankhu@chromium.org>
Signed-off-by: default avatarTodd Poynor <toddpoynor@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent de3690d0
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 47 deletions
drivers/staging/gasket/gasket_ioctl.c
View file @ 56edc4e3
...@@ -24,17 +24,24 @@ ...@@ -24,17 +24,24 @@
#endif #endif
static bool gasket_ioctl_check_permissions(struct file *filp, uint cmd); static bool gasket_ioctl_check_permissions(struct file *filp, uint cmd);
static int gasket_set_event_fd(struct gasket_dev *dev, ulong arg); static int gasket_set_event_fd(struct gasket_dev *dev,
struct gasket_interrupt_eventfd __user *argp);
static int gasket_read_page_table_size( static int gasket_read_page_table_size(
struct gasket_dev *gasket_dev, ulong arg); struct gasket_dev *gasket_dev,
struct gasket_page_table_ioctl __user *argp);
static int gasket_read_simple_page_table_size( static int gasket_read_simple_page_table_size(
struct gasket_dev *gasket_dev, ulong arg); struct gasket_dev *gasket_dev,
struct gasket_page_table_ioctl __user *argp);
static int gasket_partition_page_table( static int gasket_partition_page_table(
struct gasket_dev *gasket_dev, ulong arg); struct gasket_dev *gasket_dev,
static int gasket_map_buffers(struct gasket_dev *gasket_dev, ulong arg); struct gasket_page_table_ioctl __user *argp);
static int gasket_unmap_buffers(struct gasket_dev *gasket_dev, ulong arg); static int gasket_map_buffers(struct gasket_dev *gasket_dev,
struct gasket_page_table_ioctl __user *argp);
static int gasket_unmap_buffers(struct gasket_dev *gasket_dev,
struct gasket_page_table_ioctl __user *argp);
static int gasket_config_coherent_allocator( static int gasket_config_coherent_allocator(
struct gasket_dev *gasket_dev, ulong arg); struct gasket_dev *gasket_dev,
struct gasket_coherent_alloc_config_ioctl __user *argp);
/* /*
* standard ioctl dispatch function. * standard ioctl dispatch function.
...@@ -80,7 +87,7 @@ long gasket_handle_ioctl(struct file *filp, uint cmd, void __user *argp) ...@@ -80,7 +87,7 @@ long gasket_handle_ioctl(struct file *filp, uint cmd, void __user *argp)
retval = gasket_reset(gasket_dev, arg); retval = gasket_reset(gasket_dev, arg);
break; break;
case GASKET_IOCTL_SET_EVENTFD: case GASKET_IOCTL_SET_EVENTFD:
retval = gasket_set_event_fd(gasket_dev, arg); retval = gasket_set_event_fd(gasket_dev, argp);
break; break;
case GASKET_IOCTL_CLEAR_EVENTFD: case GASKET_IOCTL_CLEAR_EVENTFD:
trace_gasket_ioctl_integer_data(arg); trace_gasket_ioctl_integer_data(arg);
...@@ -89,31 +96,30 @@ long gasket_handle_ioctl(struct file *filp, uint cmd, void __user *argp) ...@@ -89,31 +96,30 @@ long gasket_handle_ioctl(struct file *filp, uint cmd, void __user *argp)
break; break;
case GASKET_IOCTL_PARTITION_PAGE_TABLE: case GASKET_IOCTL_PARTITION_PAGE_TABLE:
trace_gasket_ioctl_integer_data(arg); trace_gasket_ioctl_integer_data(arg);
retval = gasket_partition_page_table(gasket_dev, arg); retval = gasket_partition_page_table(gasket_dev, argp);
break; break;
case GASKET_IOCTL_NUMBER_PAGE_TABLES: case GASKET_IOCTL_NUMBER_PAGE_TABLES:
trace_gasket_ioctl_integer_data(gasket_dev->num_page_tables); trace_gasket_ioctl_integer_data(gasket_dev->num_page_tables);
if (copy_to_user((void __user *)arg, if (copy_to_user(argp, &gasket_dev->num_page_tables,
&gasket_dev->num_page_tables,
sizeof(uint64_t))) sizeof(uint64_t)))
retval = -EFAULT; retval = -EFAULT;
else else
retval = 0; retval = 0;
break; break;
case GASKET_IOCTL_PAGE_TABLE_SIZE: case GASKET_IOCTL_PAGE_TABLE_SIZE:
retval = gasket_read_page_table_size(gasket_dev, arg); retval = gasket_read_page_table_size(gasket_dev, argp);
break; break;
case GASKET_IOCTL_SIMPLE_PAGE_TABLE_SIZE: case GASKET_IOCTL_SIMPLE_PAGE_TABLE_SIZE:
retval = gasket_read_simple_page_table_size(gasket_dev, arg); retval = gasket_read_simple_page_table_size(gasket_dev, argp);
break; break;
case GASKET_IOCTL_MAP_BUFFER: case GASKET_IOCTL_MAP_BUFFER:
retval = gasket_map_buffers(gasket_dev, arg); retval = gasket_map_buffers(gasket_dev, argp);
break; break;
case GASKET_IOCTL_CONFIG_COHERENT_ALLOCATOR: case GASKET_IOCTL_CONFIG_COHERENT_ALLOCATOR:
retval = gasket_config_coherent_allocator(gasket_dev, arg); retval = gasket_config_coherent_allocator(gasket_dev, argp);
break; break;
case GASKET_IOCTL_UNMAP_BUFFER: case GASKET_IOCTL_UNMAP_BUFFER:
retval = gasket_unmap_buffers(gasket_dev, arg); retval = gasket_unmap_buffers(gasket_dev, argp);
break; break;
case GASKET_IOCTL_CLEAR_INTERRUPT_COUNTS: case GASKET_IOCTL_CLEAR_INTERRUPT_COUNTS:
/* Clear interrupt counts doesn't take an arg, so use 0. */ /* Clear interrupt counts doesn't take an arg, so use 0. */
...@@ -218,16 +224,15 @@ static bool gasket_ioctl_check_permissions(struct file *filp, uint cmd) ...@@ -218,16 +224,15 @@ static bool gasket_ioctl_check_permissions(struct file *filp, uint cmd)
/* /*
* Associate an eventfd with an interrupt. * Associate an eventfd with an interrupt.
* @gasket_dev: Pointer to the current gasket_dev we're using. * @gasket_dev: Pointer to the current gasket_dev we're using.
* @arg: Pointer to gasket_interrupt_eventfd struct in userspace. * @argp: Pointer to gasket_interrupt_eventfd struct in userspace.
*/ */
static int gasket_set_event_fd(struct gasket_dev *gasket_dev, ulong arg) static int gasket_set_event_fd(struct gasket_dev *gasket_dev,
struct gasket_interrupt_eventfd __user *argp)
{ {
struct gasket_interrupt_eventfd die; struct gasket_interrupt_eventfd die;
if (copy_from_user(&die, (void __user *)arg, if (copy_from_user(&die, argp, sizeof(struct gasket_interrupt_eventfd)))
sizeof(struct gasket_interrupt_eventfd))) {
return -EFAULT; return -EFAULT;
}
trace_gasket_ioctl_eventfd_data(die.interrupt, die.event_fd); trace_gasket_ioctl_eventfd_data(die.interrupt, die.event_fd);
...@@ -238,15 +243,16 @@ static int gasket_set_event_fd(struct gasket_dev *gasket_dev, ulong arg) ...@@ -238,15 +243,16 @@ static int gasket_set_event_fd(struct gasket_dev *gasket_dev, ulong arg)
/* /*
* Reads the size of the page table. * Reads the size of the page table.
* @gasket_dev: Pointer to the current gasket_dev we're using. * @gasket_dev: Pointer to the current gasket_dev we're using.
* @arg: Pointer to gasket_page_table_ioctl struct in userspace. * @argp: Pointer to gasket_page_table_ioctl struct in userspace.
*/ */
static int gasket_read_page_table_size(struct gasket_dev *gasket_dev, ulong arg) static int gasket_read_page_table_size(
struct gasket_dev *gasket_dev,
struct gasket_page_table_ioctl __user *argp)
{ {
int ret = 0; int ret = 0;
struct gasket_page_table_ioctl ibuf; struct gasket_page_table_ioctl ibuf;
if (copy_from_user(&ibuf, (void __user *)arg, if (copy_from_user(&ibuf, argp, sizeof(struct gasket_page_table_ioctl)))
sizeof(struct gasket_page_table_ioctl)))
return -EFAULT; return -EFAULT;
if (ibuf.page_table_index >= gasket_dev->num_page_tables) if (ibuf.page_table_index >= gasket_dev->num_page_tables)
...@@ -259,7 +265,7 @@ static int gasket_read_page_table_size(struct gasket_dev *gasket_dev, ulong arg) ...@@ -259,7 +265,7 @@ static int gasket_read_page_table_size(struct gasket_dev *gasket_dev, ulong arg)
ibuf.page_table_index, ibuf.size, ibuf.host_address, ibuf.page_table_index, ibuf.size, ibuf.host_address,
ibuf.device_address); ibuf.device_address);
if (copy_to_user((void __user *)arg, &ibuf, sizeof(ibuf))) if (copy_to_user(argp, &ibuf, sizeof(ibuf)))
return -EFAULT; return -EFAULT;
return ret; return ret;
...@@ -268,16 +274,16 @@ static int gasket_read_page_table_size(struct gasket_dev *gasket_dev, ulong arg) ...@@ -268,16 +274,16 @@ static int gasket_read_page_table_size(struct gasket_dev *gasket_dev, ulong arg)
/* /*
* Reads the size of the simple page table. * Reads the size of the simple page table.
* @gasket_dev: Pointer to the current gasket_dev we're using. * @gasket_dev: Pointer to the current gasket_dev we're using.
* @arg: Pointer to gasket_page_table_ioctl struct in userspace. * @argp: Pointer to gasket_page_table_ioctl struct in userspace.
*/ */
static int gasket_read_simple_page_table_size( static int gasket_read_simple_page_table_size(
struct gasket_dev *gasket_dev, ulong arg) struct gasket_dev *gasket_dev,
struct gasket_page_table_ioctl __user *argp)
{ {
int ret = 0; int ret = 0;
struct gasket_page_table_ioctl ibuf; struct gasket_page_table_ioctl ibuf;
if (copy_from_user(&ibuf, (void __user *)arg, if (copy_from_user(&ibuf, argp, sizeof(struct gasket_page_table_ioctl)))
sizeof(struct gasket_page_table_ioctl)))
return -EFAULT; return -EFAULT;
if (ibuf.page_table_index >= gasket_dev->num_page_tables) if (ibuf.page_table_index >= gasket_dev->num_page_tables)
...@@ -290,7 +296,7 @@ static int gasket_read_simple_page_table_size( ...@@ -290,7 +296,7 @@ static int gasket_read_simple_page_table_size(
ibuf.page_table_index, ibuf.size, ibuf.host_address, ibuf.page_table_index, ibuf.size, ibuf.host_address,
ibuf.device_address); ibuf.device_address);
if (copy_to_user((void __user *)arg, &ibuf, sizeof(ibuf))) if (copy_to_user(argp, &ibuf, sizeof(ibuf)))
return -EFAULT; return -EFAULT;
return ret; return ret;
...@@ -299,16 +305,17 @@ static int gasket_read_simple_page_table_size( ...@@ -299,16 +305,17 @@ static int gasket_read_simple_page_table_size(
/* /*
* Sets the boundary between the simple and extended page tables. * Sets the boundary between the simple and extended page tables.
* @gasket_dev: Pointer to the current gasket_dev we're using. * @gasket_dev: Pointer to the current gasket_dev we're using.
* @arg: Pointer to gasket_page_table_ioctl struct in userspace. * @argp: Pointer to gasket_page_table_ioctl struct in userspace.
*/ */
static int gasket_partition_page_table(struct gasket_dev *gasket_dev, ulong arg) static int gasket_partition_page_table(
struct gasket_dev *gasket_dev,
struct gasket_page_table_ioctl __user *argp)
{ {
int ret; int ret;
struct gasket_page_table_ioctl ibuf; struct gasket_page_table_ioctl ibuf;
uint max_page_table_size; uint max_page_table_size;
if (copy_from_user(&ibuf, (void __user *)arg, if (copy_from_user(&ibuf, argp, sizeof(struct gasket_page_table_ioctl)))
sizeof(struct gasket_page_table_ioctl)))
return -EFAULT; return -EFAULT;
trace_gasket_ioctl_page_table_data( trace_gasket_ioctl_page_table_data(
...@@ -340,14 +347,14 @@ static int gasket_partition_page_table(struct gasket_dev *gasket_dev, ulong arg) ...@@ -340,14 +347,14 @@ static int gasket_partition_page_table(struct gasket_dev *gasket_dev, ulong arg)
/* /*
* Maps a userspace buffer to a device virtual address. * Maps a userspace buffer to a device virtual address.
* @gasket_dev: Pointer to the current gasket_dev we're using. * @gasket_dev: Pointer to the current gasket_dev we're using.
* @arg: Pointer to a gasket_page_table_ioctl struct in userspace. * @argp: Pointer to a gasket_page_table_ioctl struct in userspace.
*/ */
static int gasket_map_buffers(struct gasket_dev *gasket_dev, ulong arg) static int gasket_map_buffers(struct gasket_dev *gasket_dev,
struct gasket_page_table_ioctl __user *argp)
{ {
struct gasket_page_table_ioctl ibuf; struct gasket_page_table_ioctl ibuf;
if (copy_from_user(&ibuf, (void __user *)arg, if (copy_from_user(&ibuf, argp, sizeof(struct gasket_page_table_ioctl)))
sizeof(struct gasket_page_table_ioctl)))
return -EFAULT; return -EFAULT;
trace_gasket_ioctl_page_table_data( trace_gasket_ioctl_page_table_data(
...@@ -370,14 +377,14 @@ static int gasket_map_buffers(struct gasket_dev *gasket_dev, ulong arg) ...@@ -370,14 +377,14 @@ static int gasket_map_buffers(struct gasket_dev *gasket_dev, ulong arg)
/* /*
* Unmaps a userspace buffer from a device virtual address. * Unmaps a userspace buffer from a device virtual address.
* @gasket_dev: Pointer to the current gasket_dev we're using. * @gasket_dev: Pointer to the current gasket_dev we're using.
* @arg: Pointer to a gasket_page_table_ioctl struct in userspace. * @argp: Pointer to a gasket_page_table_ioctl struct in userspace.
*/ */
static int gasket_unmap_buffers(struct gasket_dev *gasket_dev, ulong arg) static int gasket_unmap_buffers(struct gasket_dev *gasket_dev,
struct gasket_page_table_ioctl __user *argp)
{ {
struct gasket_page_table_ioctl ibuf; struct gasket_page_table_ioctl ibuf;
if (copy_from_user(&ibuf, (void __user *)arg, if (copy_from_user(&ibuf, argp, sizeof(struct gasket_page_table_ioctl)))
sizeof(struct gasket_page_table_ioctl)))
return -EFAULT; return -EFAULT;
trace_gasket_ioctl_page_table_data( trace_gasket_ioctl_page_table_data(
...@@ -402,15 +409,16 @@ static int gasket_unmap_buffers(struct gasket_dev *gasket_dev, ulong arg) ...@@ -402,15 +409,16 @@ static int gasket_unmap_buffers(struct gasket_dev *gasket_dev, ulong arg)
* Tell the driver to reserve structures for coherent allocation, and allocate * Tell the driver to reserve structures for coherent allocation, and allocate
* or free the corresponding memory. * or free the corresponding memory.
* @dev: Pointer to the current gasket_dev we're using. * @dev: Pointer to the current gasket_dev we're using.
* @arg: Pointer to a gasket_coherent_alloc_config_ioctl struct in userspace. * @argp: Pointer to a gasket_coherent_alloc_config_ioctl struct in userspace.
*/ */
static int gasket_config_coherent_allocator( static int gasket_config_coherent_allocator(
struct gasket_dev *gasket_dev, ulong arg) struct gasket_dev *gasket_dev,
struct gasket_coherent_alloc_config_ioctl __user *argp)
{ {
int ret; int ret;
struct gasket_coherent_alloc_config_ioctl ibuf; struct gasket_coherent_alloc_config_ioctl ibuf;
if (copy_from_user(&ibuf, (void __user *)arg, if (copy_from_user(&ibuf, argp,
sizeof(struct gasket_coherent_alloc_config_ioctl))) sizeof(struct gasket_coherent_alloc_config_ioctl)))
return -EFAULT; return -EFAULT;
...@@ -432,7 +440,7 @@ static int gasket_config_coherent_allocator( ...@@ -432,7 +440,7 @@ static int gasket_config_coherent_allocator(
gasket_dev, ibuf.size, &ibuf.dma_address, gasket_dev, ibuf.size, &ibuf.dma_address,
ibuf.page_table_index); ibuf.page_table_index);
} }
if (copy_to_user((void __user *)arg, &ibuf, sizeof(ibuf))) if (copy_to_user(argp, &ibuf, sizeof(ibuf)))
return -EFAULT; return -EFAULT;
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7