iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: lustre: libcfs: merge code from libcfs_ioctl into libcfs_ioctl_getdata

Browse Source 
This is apart of the cleanup of libcfs_ioctl* code. In this
part some of the code in libcfs_ioctl is migrated into
libcfs_ioctl_getdata_len() which is renamed libcfs_ioctl_getdata()

Signed-off-by: Liang Zhen <liang.zhen@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5435
Reviewed-on: http://review.whamcloud.com/11313
Reviewed-by: Bobi Jam <bobijam@gmail.com>
Reviewed-by: Johann Lombardi <johann.lombardi@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Liang Zhen 2016-03-22 19:03:50 -04:00 committed by Greg Kroah-Hartman
parent 74bfc12982
commit e4efb34a3f
3 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h
View File

@ -225,8 +225,8 @@ static inline bool libcfs_ioctl_is_invalid(struct libcfs_ioctl_data *data)
int libcfs_register_ioctl(struct libcfs_ioctl_handler *hand);
int libcfs_deregister_ioctl(struct libcfs_ioctl_handler *hand);
int libcfs_ioctl_getdata_len(const struct libcfs_ioctl_hdr __user *arg,
__u32 *buf_len);
int libcfs_ioctl_getdata(struct libcfs_ioctl_hdr **hdr_pp,
const struct libcfs_ioctl_hdr __user *uparam);
int libcfs_ioctl_popdata(void __user *arg, void *buf, int size);
int libcfs_ioctl_data_adjust(struct libcfs_ioctl_data *data);

23
drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
View File

@ -57,12 +57,13 @@ int libcfs_ioctl_data_adjust(struct libcfs_ioctl_data *data)
return 0;
}
int libcfs_ioctl_getdata_len(const struct libcfs_ioctl_hdr __user *arg,
__u32 *len)
int libcfs_ioctl_getdata(struct libcfs_ioctl_hdr **hdr_pp,
const struct libcfs_ioctl_hdr __user *uhdr)
{
struct libcfs_ioctl_hdr hdr;
int err = 0;
if (copy_from_user(&hdr, arg, sizeof(hdr)))
if (copy_from_user(&hdr, uhdr, sizeof(uhdr)))
return -EFAULT;
if (hdr.ioc_version != LIBCFS_IOCTL_VERSION &&
@ -72,9 +73,21 @@ int libcfs_ioctl_getdata_len(const struct libcfs_ioctl_hdr __user *arg,
return -EINVAL;
}
*len = hdr.ioc_len;
if (hdr.ioc_len > LIBCFS_IOC_DATA_MAX) {
CERROR("libcfs ioctl: user buffer is too large %d/%d\n",
hdr.ioc_len, LIBCFS_IOC_DATA_MAX);
return -EINVAL;
}
return 0;
LIBCFS_ALLOC(*hdr_pp, hdr.ioc_len);
if (!*hdr_pp)
return -ENOMEM;
if (copy_from_user(*hdr_pp, uhdr, hdr.ioc_len)) {
LIBCFS_FREE(*hdr_pp, hdr.ioc_len);
err = -EFAULT;
}
return err;
}
int libcfs_ioctl_popdata(void __user *arg, void *data, int size)

28
drivers/staging/lustre/lnet/libcfs/module.c
View File

@ -172,36 +172,14 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd,
{
struct libcfs_ioctl_hdr *hdr;
int err = 0;
__u32 buf_len;
err = libcfs_ioctl_getdata_len(arg, &buf_len);
/* 'cmd' and permissions get checked in our arch-specific caller */
err = libcfs_ioctl_getdata(&hdr, arg);
if (err)
return err;
/*
* do a check here to restrict the size of the memory
* to allocate to guard against DoS attacks.
*/
if (buf_len > LIBCFS_IOC_DATA_MAX) {
CERROR("LNET: user buffer exceeds kernel buffer\n");
return -EINVAL;
}
LIBCFS_ALLOC_GFP(hdr, buf_len, GFP_KERNEL);
if (!hdr)
return -ENOMEM;
/* 'cmd' and permissions get checked in our arch-specific caller */
if (copy_from_user(hdr, arg, buf_len)) {
CERROR("LNET ioctl: data error\n");
err = -EFAULT;
goto out;
}
err = libcfs_ioctl_handle(pfile, cmd, arg, hdr);
out:
LIBCFS_FREE(hdr, buf_len);
LIBCFS_FREE(hdr, hdr->ioc_len);
return err;
}