forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging/rdma/hfi1: Further clean up hfi1_ioctl parameter checks

Browse source 
Final clean up of the if/then/else clause for the parameter checks of
hfi1_ioctl

Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ira Weiny 2015-12-02 00:43:36 -05:00 • committed by Greg Kroah-Hartman
parent d8e499ffe4
commit f1811cf632
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
drivers/staging/rdma/hfi1/diag.c
View file

@ -982,24 +982,28 @@ static long hfi1_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
struct hfi1_pportdata *ppd = NULL;
unsigned int index;
struct hfi1_link_info link_info;
int read_cmd, write_cmd, read_ok, write_ok;
dd = hfi1_dd_from_sc_inode(fp->f_inode);
if (!dd)
return -ENODEV;
mode_flag = dd->hfi1_snoop.mode_flag;
read_cmd = _IOC_DIR(cmd) & _IOC_READ;
write_cmd = _IOC_DIR(cmd) & _IOC_WRITE;
write_ok = access_ok(VERIFY_WRITE, (void __user *)arg, _IOC_SIZE(cmd));
read_ok = access_ok(VERIFY_READ, (void __user *)arg, _IOC_SIZE(cmd));
if (((_IOC_DIR(cmd) & _IOC_READ)
&& !access_ok(VERIFY_WRITE, (void __user *)arg, _IOC_SIZE(cmd)))
|| ((_IOC_DIR(cmd) & _IOC_WRITE)
&& !access_ok(VERIFY_READ, (void __user *)arg, _IOC_SIZE(cmd)))) {
if ((read_cmd && !write_ok) || (write_cmd && !read_ok))
return -EFAULT;
} else if (!capable(CAP_SYS_ADMIN)) {
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
} else if ((mode_flag & HFI1_PORT_CAPTURE_MODE) &&
(cmd != HFI1_SNOOP_IOCCLEARQUEUE) &&
(cmd != HFI1_SNOOP_IOCCLEARFILTER) &&
(cmd != HFI1_SNOOP_IOCSETFILTER)) {
if ((mode_flag & HFI1_PORT_CAPTURE_MODE) &&
(cmd != HFI1_SNOOP_IOCCLEARQUEUE) &&
(cmd != HFI1_SNOOP_IOCCLEARFILTER) &&
(cmd != HFI1_SNOOP_IOCSETFILTER))
/* Capture devices are allowed only 3 operations
* 1.Clear capture queue
* 2.Clear capture filter
@ -1007,7 +1011,6 @@ static long hfi1_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
* Other are invalid.
*/
return -EINVAL;
}
spin_lock_irqsave(&dd->hfi1_snoop.snoop_lock, flags);