kellen/gasket-driver
1
0
Fork 0
forked from MIrrors/gasket-driver
Code Pull Requests Actions Packages Activity

staging: gasket: apex ioctl add __user annotations

Browse Source 
Add __user annotation to ioctl pointer argument, for sparse checking.

Change-Id: I677aa0a2eed9a34b799273e0a3a7cb45ced14c8e
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:18 -07:00
committed by Alex Van Damme
parent 73e7d5fac5
commit 53f54339d7
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apex_driver.c
View File

@@ -5,6 +5,7 @@
* Copyright (C) 2018 Google, Inc.
*/
#include <linux/compiler.h>
#include <linux/delay.h>
#include <linux/fs.h>
#include <linux/init.h>
@@ -142,9 +143,10 @@ static int apex_get_status(struct gasket_dev *gasket_dev);
static bool apex_ioctl_check_permissions(struct file *file, uint cmd);
static long apex_ioctl(struct file *file, uint cmd, ulong arg);
static long apex_ioctl(struct file *file, uint cmd, void __user *argp);
static long apex_clock_gating(struct gasket_dev *gasket_dev, ulong arg);
static long apex_clock_gating(struct gasket_dev *gasket_dev,
struct apex_gate_clock_ioctl __user *argp);
static long apex_set_performance_expectation(struct gasket_dev *gasket_dev, ulong arg);
@@ -637,7 +639,7 @@ static bool apex_ioctl_check_permissions(struct file *filp, uint cmd)
/*
* Apex-specific ioctl handler.
*/
static long apex_ioctl(struct file *filp, uint cmd, ulong arg)
static long apex_ioctl(struct file *filp, uint cmd, void __user *argp)
{
struct gasket_dev *gasket_dev = filp->private_data;
@@ -646,9 +648,9 @@ static long apex_ioctl(struct file *filp, uint cmd, ulong arg)
switch (cmd) {
case APEX_IOCTL_GATE_CLOCK:
return apex_clock_gating(gasket_dev, arg);
return apex_clock_gating(gasket_dev, argp);
case APEX_IOCTL_PERFORMANCE_EXPECTATION:
return apex_set_performance_expectation(gasket_dev, arg);
return apex_set_performance_expectation(gasket_dev, argp);
default:
return -ENOTTY; /* unknown command */
}
@@ -657,16 +659,17 @@ static long apex_ioctl(struct file *filp, uint cmd, ulong arg)
/*
* Gates or un-gates Apex clock.
* @gasket_dev: Gasket device pointer.
* @arg: User ioctl arg, in this case to a apex_gate_clock_ioctl struct.
* @argp: User ioctl arg, pointer to a apex_gate_clock_ioctl struct.
*/
static long apex_clock_gating(struct gasket_dev *gasket_dev, ulong arg)
static long apex_clock_gating(struct gasket_dev *gasket_dev,
struct apex_gate_clock_ioctl __user *argp)
{
struct apex_gate_clock_ioctl ibuf;
if (bypass_top_level || !allow_sw_clock_gating)
return 0;
if (copy_from_user(&ibuf, (void __user *)arg, sizeof(ibuf)))
if (copy_from_user(&ibuf, argp, sizeof(ibuf)))
return -EFAULT;
gasket_log_error(gasket_dev, "%s %llu", __func__, ibuf.enable);