Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-12 00:00:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: gasket: common ioctl dispatcher add __user annotations

Browse Source 
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>
This commit is contained in:
Todd Poynor 2018-07-19 20:49:19 -07:00 committed by Greg Kroah-Hartman
parent c13435deaa
commit de3690d025
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/gasket/gasket_ioctl.c
View File

@ -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;

4
drivers/staging/gasket/gasket_ioctl.h
View File

@ -5,6 +5,8 @@
#include "gasket_core.h"
#include <linux/compiler.h>
/*
* Handle Gasket common ioctls.
* @filp: Pointer to the ioctl's file.
@ -13,7 +15,7 @@
*
* 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.