Commit de3690d0 authored by Todd Poynor's avatar Todd Poynor Committed by Greg Kroah-Hartman

staging: gasket: common ioctl dispatcher add __user annotations

Add __user annotation to gasket core 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 c13435de
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "gasket_interrupt.h" #include "gasket_interrupt.h"
#include "gasket_logging.h" #include "gasket_logging.h"
#include "gasket_page_table.h" #include "gasket_page_table.h"
#include <linux/compiler.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
...@@ -39,13 +40,14 @@ static int gasket_config_coherent_allocator( ...@@ -39,13 +40,14 @@ static int gasket_config_coherent_allocator(
* standard ioctl dispatch function. * standard ioctl dispatch function.
* @filp: File structure pointer describing this node usage session. * @filp: File structure pointer describing this node usage session.
* @cmd: ioctl number to handle. * @cmd: ioctl number to handle.
* @arg: ioctl-specific data pointer. * @argp: ioctl-specific data pointer.
* *
* Standard ioctl dispatcher; forwards operations to individual handlers. * 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; struct gasket_dev *gasket_dev;
unsigned long arg = (unsigned long)argp;
int retval; int retval;
gasket_dev = (struct gasket_dev *)filp->private_data; gasket_dev = (struct gasket_dev *)filp->private_data;
...@@ -53,7 +55,7 @@ long gasket_handle_ioctl(struct file *filp, uint cmd, ulong arg) ...@@ -53,7 +55,7 @@ long gasket_handle_ioctl(struct file *filp, uint cmd, ulong arg)
if (gasket_get_ioctl_permissions_cb(gasket_dev)) { if (gasket_get_ioctl_permissions_cb(gasket_dev)) {
retval = gasket_get_ioctl_permissions_cb(gasket_dev)( retval = gasket_get_ioctl_permissions_cb(gasket_dev)(
filp, cmd, arg); filp, cmd, argp);
if (retval < 0) { if (retval < 0) {
trace_gasket_ioctl_exit(-EPERM); trace_gasket_ioctl_exit(-EPERM);
return retval; return retval;
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
#include "gasket_core.h" #include "gasket_core.h"
#include <linux/compiler.h>
/* /*
* Handle Gasket common ioctls. * Handle Gasket common ioctls.
* @filp: Pointer to the ioctl's file. * @filp: Pointer to the ioctl's file.
...@@ -13,7 +15,7 @@ ...@@ -13,7 +15,7 @@
* *
* Returns 0 on success and nonzero on failure. * Returns 0 on success and nonzero on failure.
*/ */
long gasket_handle_ioctl(struct file *filp, uint cmd, ulong arg); long gasket_handle_ioctl(struct file *filp, uint cmd, void __user *argp);
/* /*
* Determines if an ioctl is part of the standard Gasket framework. * Determines if an ioctl is part of the standard Gasket framework.
......
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