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

staging: gasket: apex ioctl add __user annotations

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