aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/lustre/lustre/libcfs/module.c
diff options
context:
space:
mode:
authorOleg Drokin <green@linuxhacker.ru>2016-01-03 12:05:37 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-03 14:27:25 -0800
commite2d52f7b3adb0e5b80a068a2b2628bc8c2e01c6d (patch)
tree636f1c376f852a0bd0e2099c7e4068e5ba2ea172 /drivers/staging/lustre/lustre/libcfs/module.c
parentstaging/lustre/obdecho: remove userspace LSM handling (diff)
downloadlinux-dev-e2d52f7b3adb0e5b80a068a2b2628bc8c2e01c6d.tar.xz
linux-dev-e2d52f7b3adb0e5b80a068a2b2628bc8c2e01c6d.zip
staging/lustre: Add __user attributes to libcfs_ioctl_get/popdata args
Just make clear which pointers are from userspace and which are not in libcfs_ioctl_getdata/libcfs_ioctl_popdata and their callers. Signed-off-by: Oleg Drokin <green@linuxhacker.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lustre/libcfs/module.c')
-rw-r--r--drivers/staging/lustre/lustre/libcfs/module.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
index af516a29c20e..d5a047bd0180 100644
--- a/drivers/staging/lustre/lustre/libcfs/module.c
+++ b/drivers/staging/lustre/lustre/libcfs/module.c
@@ -116,7 +116,7 @@ int libcfs_deregister_ioctl(struct libcfs_ioctl_handler *hand)
EXPORT_SYMBOL(libcfs_deregister_ioctl);
static int libcfs_ioctl_int(struct cfs_psdev_file *pfile, unsigned long cmd,
- void *arg, struct libcfs_ioctl_data *data)
+ void __user *arg, struct libcfs_ioctl_data *data)
{
int err = -EINVAL;
@@ -157,7 +157,8 @@ static int libcfs_ioctl_int(struct cfs_psdev_file *pfile, unsigned long cmd,
return err;
}
-static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *arg)
+static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd,
+ void __user *arg)
{
char *buf;
struct libcfs_ioctl_data *data;