diff options
| author | Todd Poynor <toddpoynor@google.com> | 2018-07-19 20:49:19 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-21 08:50:36 +0200 |
| commit | de3690d025fced530a587b820f00f67cd964289e (patch) | |
| tree | cde89b6558ed839f436a0ead1347d4b8ca3b9bfa /drivers/staging/gasket/gasket_ioctl.c | |
| parent | c13435deaadca078ce5651c43ed8d7561215b20a (diff) | |
staging: gasket: common ioctl dispatcher add __user annotations
Add __user annotation to gasket core common ioctl pointer arguments for
sparse checking.
Reported-by: Dmitry Torokhov <dtor@chromium.org>
Signed-off-by: Zhongze Hu <frankhu@chromium.org>
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/gasket/gasket_ioctl.c')
| -rw-r--r-- | drivers/staging/gasket/gasket_ioctl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/staging/gasket/gasket_ioctl.c b/drivers/staging/gasket/gasket_ioctl.c index 8fd44979fe71..998d0e215523 100644 --- a/drivers/staging/gasket/gasket_ioctl.c +++ b/drivers/staging/gasket/gasket_ioctl.c @@ -7,6 +7,7 @@ #include "gasket_interrupt.h" #include "gasket_logging.h" #include "gasket_page_table.h" +#include <linux/compiler.h> #include <linux/fs.h> #include <linux/uaccess.h> @@ -39,13 +40,14 @@ static int gasket_config_coherent_allocator( * standard ioctl dispatch function. * @filp: File structure pointer describing this node usage session. * @cmd: ioctl number to handle. - * @arg: ioctl-specific data pointer. + * @argp: ioctl-specific data pointer. * * Standard ioctl dispatcher; forwards operations to individual handlers. */ -long gasket_handle_ioctl(struct file *filp, uint cmd, ulong arg) +long gasket_handle_ioctl(struct file *filp, uint cmd, void __user *argp) { struct gasket_dev *gasket_dev; + unsigned long arg = (unsigned long)argp; int retval; gasket_dev = (struct gasket_dev *)filp->private_data; @@ -53,7 +55,7 @@ long gasket_handle_ioctl(struct file *filp, uint cmd, ulong arg) if (gasket_get_ioctl_permissions_cb(gasket_dev)) { retval = gasket_get_ioctl_permissions_cb(gasket_dev)( - filp, cmd, arg); + filp, cmd, argp); if (retval < 0) { trace_gasket_ioctl_exit(-EPERM); return retval; |