Skip to content

L
linux
Commit 845e30e6 authored by Ira Weiny's avatar Ira Weiny Committed by Greg Kroah-Hartman
Browse files
Options

staging/rdma/hfi1: Return early from hfi1_ioctl parameter errors 

Rather than have a switch in a large else clause make the parameter checks
return immediately.
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ae1724df
Hide whitespace changes
Inline Side-by-side
Showing with 173 additions and 175 deletions
drivers/staging/rdma/hfi1/diag.c
View file @ 845e30e6
...@@ -987,17 +987,15 @@ static long hfi1_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) ...@@ -987,17 +987,15 @@ static long hfi1_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
if (!dd) if (!dd)
return -ENODEV; return -ENODEV;
spin_lock_irqsave(&dd->hfi1_snoop.snoop_lock, flags);
mode_flag = dd->hfi1_snoop.mode_flag; mode_flag = dd->hfi1_snoop.mode_flag;
if (((_IOC_DIR(cmd) & _IOC_READ) if (((_IOC_DIR(cmd) & _IOC_READ)
&& !access_ok(VERIFY_WRITE, (void __user *)arg, _IOC_SIZE(cmd))) && !access_ok(VERIFY_WRITE, (void __user *)arg, _IOC_SIZE(cmd)))
|| ((_IOC_DIR(cmd) & _IOC_WRITE) || ((_IOC_DIR(cmd) & _IOC_WRITE)
&& !access_ok(VERIFY_READ, (void __user *)arg, _IOC_SIZE(cmd)))) { && !access_ok(VERIFY_READ, (void __user *)arg, _IOC_SIZE(cmd)))) {
ret = -EFAULT; return -EFAULT;
} else if (!capable(CAP_SYS_ADMIN)) { } else if (!capable(CAP_SYS_ADMIN)) {
ret = -EPERM; return -EPERM;
} else if ((mode_flag & HFI1_PORT_CAPTURE_MODE) && } else if ((mode_flag & HFI1_PORT_CAPTURE_MODE) &&
(cmd != HFI1_SNOOP_IOCCLEARQUEUE) && (cmd != HFI1_SNOOP_IOCCLEARQUEUE) &&
(cmd != HFI1_SNOOP_IOCCLEARFILTER) && (cmd != HFI1_SNOOP_IOCCLEARFILTER) &&
...@@ -1008,208 +1006,208 @@ static long hfi1_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) ...@@ -1008,208 +1006,208 @@ static long hfi1_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
* 3.Set capture filter * 3.Set capture filter
* Other are invalid. * Other are invalid.
*/ */
return -EINVAL;
}
spin_lock_irqsave(&dd->hfi1_snoop.snoop_lock, flags);
switch (cmd) {
case HFI1_SNOOP_IOCSETLINKSTATE:
snoop_dbg("HFI1_SNOOP_IOCSETLINKSTATE is not valid");
ret = -EINVAL; ret = -EINVAL;
} else { break;
switch (cmd) {
case HFI1_SNOOP_IOCSETLINKSTATE: case HFI1_SNOOP_IOCSETLINKSTATE_EXTRA:
snoop_dbg("HFI1_SNOOP_IOCSETLINKSTATE is not valid"); memset(&link_info, 0, sizeof(link_info));
if (copy_from_user(&link_info,
(struct hfi1_link_info __user *)arg,
sizeof(link_info)))
ret = -EFAULT;
value = link_info.port_state;
index = link_info.port_number;
if (index > dd->num_pports - 1) {
ret = -EINVAL; ret = -EINVAL;
break; break;
}
case HFI1_SNOOP_IOCSETLINKSTATE_EXTRA: ppd = &dd->pport[index];
memset(&link_info, 0, sizeof(link_info)); if (!ppd) {
ret = -EINVAL;
break;
}
if (copy_from_user(&link_info, /* What we want to transition to */
(struct hfi1_link_info __user *)arg, phys_state = (value >> 4) & 0xF;
sizeof(link_info))) link_state = value & 0xF;
ret = -EFAULT; snoop_dbg("Setting link state 0x%x", value);
value = link_info.port_state; switch (link_state) {
index = link_info.port_number; case IB_PORT_NOP:
if (index > dd->num_pports - 1) { if (phys_state == 0)
ret = -EINVAL;
break; break;
} /* fall through */
case IB_PORT_DOWN:
ppd = &dd->pport[index]; switch (phys_state) {
if (!ppd) { case 0:
ret = -EINVAL; dev_state = HLS_DN_DOWNDEF;
break;
}
/* What we want to transition to */
phys_state = (value >> 4) & 0xF;
link_state = value & 0xF;
snoop_dbg("Setting link state 0x%x", value);
switch (link_state) {
case IB_PORT_NOP:
if (phys_state == 0)
break;
/* fall through */
case IB_PORT_DOWN:
switch (phys_state) {
case 0:
dev_state = HLS_DN_DOWNDEF;
break;
case 2:
dev_state = HLS_DN_POLL;
break;
case 3:
dev_state = HLS_DN_DISABLE;
break;
default:
ret = -EINVAL;
goto done;
}
ret = set_link_state(ppd, dev_state);
break; break;
case IB_PORT_ARMED: case 2:
ret = set_link_state(ppd, HLS_UP_ARMED); dev_state = HLS_DN_POLL;
if (!ret)
send_idle_sma(dd, SMA_IDLE_ARM);
break; break;
case IB_PORT_ACTIVE: case 3:
ret = set_link_state(ppd, HLS_UP_ACTIVE); dev_state = HLS_DN_DISABLE;
if (!ret)
send_idle_sma(dd, SMA_IDLE_ACTIVE);
break; break;
default: default:
ret = -EINVAL; ret = -EINVAL;
break; goto done;
}
if (ret)
break;
/* fall through */
case HFI1_SNOOP_IOCGETLINKSTATE:
case HFI1_SNOOP_IOCGETLINKSTATE_EXTRA:
if (cmd == HFI1_SNOOP_IOCGETLINKSTATE_EXTRA) {
memset(&link_info, 0, sizeof(link_info));
if (copy_from_user(&link_info,
(struct hfi1_link_info __user *)arg,
sizeof(link_info)))
ret = -EFAULT;
index = link_info.port_number;
} else {
ret = __get_user(index, (int __user *) arg);
if (ret != 0)
break;
}
if (index > dd->num_pports - 1) {
ret = -EINVAL;
break;
}
ppd = &dd->pport[index];
if (!ppd) {
ret = -EINVAL;
break;
}
value = hfi1_ibphys_portstate(ppd);
value <<= 4;
value |= driver_lstate(ppd);
snoop_dbg("Link port | Link State: %d", value);
if ((cmd == HFI1_SNOOP_IOCGETLINKSTATE_EXTRA) ||
(cmd == HFI1_SNOOP_IOCSETLINKSTATE_EXTRA)) {
link_info.port_state = value;
link_info.node_guid = cpu_to_be64(ppd->guid);
link_info.link_speed_active =
ppd->link_speed_active;
link_info.link_width_active =
ppd->link_width_active;
if (copy_to_user(
(struct hfi1_link_info __user *)arg,
&link_info, sizeof(link_info)))
ret = -EFAULT;
} else {
ret = __put_user(value, (int __user *)arg);
} }
ret = set_link_state(ppd, dev_state);
break; break;
case IB_PORT_ARMED:
case HFI1_SNOOP_IOCCLEARQUEUE: ret = set_link_state(ppd, HLS_UP_ARMED);
snoop_dbg("Clearing snoop queue"); if (!ret)
drain_snoop_list(&dd->hfi1_snoop.queue); send_idle_sma(dd, SMA_IDLE_ARM);
break; break;
case IB_PORT_ACTIVE:
case HFI1_SNOOP_IOCCLEARFILTER: ret = set_link_state(ppd, HLS_UP_ACTIVE);
snoop_dbg("Clearing filter"); if (!ret)
if (dd->hfi1_snoop.filter_callback) { send_idle_sma(dd, SMA_IDLE_ACTIVE);
/* Drain packets first */ break;
drain_snoop_list(&dd->hfi1_snoop.queue); default:
dd->hfi1_snoop.filter_callback = NULL; ret = -EINVAL;
}
kfree(dd->hfi1_snoop.filter_value);
dd->hfi1_snoop.filter_value = NULL;
break; break;
}
case HFI1_SNOOP_IOCSETFILTER: if (ret)
snoop_dbg("Setting filter"); break;
/* just copy command structure */ /* fall through */
argp = (unsigned long *)arg; case HFI1_SNOOP_IOCGETLINKSTATE:
if (copy_from_user(&filter_cmd, (void __user *)argp, case HFI1_SNOOP_IOCGETLINKSTATE_EXTRA:
sizeof(filter_cmd))) { if (cmd == HFI1_SNOOP_IOCGETLINKSTATE_EXTRA) {
memset(&link_info, 0, sizeof(link_info));
if (copy_from_user(&link_info,
(struct hfi1_link_info __user *)arg,
sizeof(link_info)))
ret = -EFAULT; ret = -EFAULT;
index = link_info.port_number;
} else {
ret = __get_user(index, (int __user *)arg);
if (ret != 0)
break; break;
} }
if (filter_cmd.opcode >= HFI1_MAX_FILTERS) {
pr_alert("Invalid opcode in request\n");
ret = -EINVAL;
break;
}
snoop_dbg("Opcode %d Len %d Ptr %p", if (index > dd->num_pports - 1) {
filter_cmd.opcode, filter_cmd.length, ret = -EINVAL;
filter_cmd.value_ptr); break;
}
filter_value = kcalloc(filter_cmd.length, sizeof(u8), ppd = &dd->pport[index];
GFP_KERNEL); if (!ppd) {
if (!filter_value) { ret = -EINVAL;
pr_alert("Not enough memory\n"); break;
ret = -ENOMEM; }
break; value = hfi1_ibphys_portstate(ppd);
} value <<= 4;
/* copy remaining data from userspace */ value |= driver_lstate(ppd);
if (copy_from_user((u8 *)filter_value,
(void __user *)filter_cmd.value_ptr, snoop_dbg("Link port | Link State: %d", value);
filter_cmd.length)) {
kfree(filter_value); if ((cmd == HFI1_SNOOP_IOCGETLINKSTATE_EXTRA) ||
(cmd == HFI1_SNOOP_IOCSETLINKSTATE_EXTRA)) {
link_info.port_state = value;
link_info.node_guid = cpu_to_be64(ppd->guid);
link_info.link_speed_active =
ppd->link_speed_active;
link_info.link_width_active =
ppd->link_width_active;
if (copy_to_user((struct hfi1_link_info __user *)arg,
&link_info, sizeof(link_info)))
ret = -EFAULT; ret = -EFAULT;
break; } else {
} ret = __put_user(value, (int __user *)arg);
}
break;
case HFI1_SNOOP_IOCCLEARQUEUE:
snoop_dbg("Clearing snoop queue");
drain_snoop_list(&dd->hfi1_snoop.queue);
break;
case HFI1_SNOOP_IOCCLEARFILTER:
snoop_dbg("Clearing filter");
if (dd->hfi1_snoop.filter_callback) {
/* Drain packets first */ /* Drain packets first */
drain_snoop_list(&dd->hfi1_snoop.queue); drain_snoop_list(&dd->hfi1_snoop.queue);
dd->hfi1_snoop.filter_callback = dd->hfi1_snoop.filter_callback = NULL;
hfi1_filters[filter_cmd.opcode].filter; }
/* just in case we see back to back sets */ kfree(dd->hfi1_snoop.filter_value);
kfree(dd->hfi1_snoop.filter_value); dd->hfi1_snoop.filter_value = NULL;
dd->hfi1_snoop.filter_value = filter_value; break;
case HFI1_SNOOP_IOCSETFILTER:
snoop_dbg("Setting filter");
/* just copy command structure */
argp = (unsigned long *)arg;
if (copy_from_user(&filter_cmd, (void __user *)argp,
sizeof(filter_cmd))) {
ret = -EFAULT;
break; break;
case HFI1_SNOOP_IOCGETVERSION: }
value = SNOOP_CAPTURE_VERSION; if (filter_cmd.opcode >= HFI1_MAX_FILTERS) {
snoop_dbg("Getting version: %d", value); pr_alert("Invalid opcode in request\n");
ret = __put_user(value, (int __user *)arg); ret = -EINVAL;
break; break;
case HFI1_SNOOP_IOCSET_OPTS: }
snoop_flags = 0;
ret = __get_user(value, (int __user *) arg);
if (ret != 0)
break;
snoop_dbg("Setting snoop option %d", value); snoop_dbg("Opcode %d Len %d Ptr %p",
if (value & SNOOP_DROP_SEND) filter_cmd.opcode, filter_cmd.length,
snoop_flags |= SNOOP_DROP_SEND; filter_cmd.value_ptr);
if (value & SNOOP_USE_METADATA)
snoop_flags |= SNOOP_USE_METADATA; filter_value = kcalloc(filter_cmd.length, sizeof(u8),
GFP_KERNEL);
if (!filter_value) {
ret = -ENOMEM;
break; break;
default: }
ret = -ENOTTY; /* copy remaining data from userspace */
if (copy_from_user((u8 *)filter_value,
(void __user *)filter_cmd.value_ptr,
filter_cmd.length)) {
kfree(filter_value);
ret = -EFAULT;
break; break;
} }
/* Drain packets first */
drain_snoop_list(&dd->hfi1_snoop.queue);
dd->hfi1_snoop.filter_callback =
hfi1_filters[filter_cmd.opcode].filter;
/* just in case we see back to back sets */
kfree(dd->hfi1_snoop.filter_value);
dd->hfi1_snoop.filter_value = filter_value;
break;
case HFI1_SNOOP_IOCGETVERSION:
value = SNOOP_CAPTURE_VERSION;
snoop_dbg("Getting version: %d", value);
ret = __put_user(value, (int __user *)arg);
break;
case HFI1_SNOOP_IOCSET_OPTS:
snoop_flags = 0;
ret = __get_user(value, (int __user *)arg);
if (ret != 0)
break;
snoop_dbg("Setting snoop option %d", value);
if (value & SNOOP_DROP_SEND)
snoop_flags |= SNOOP_DROP_SEND;
if (value & SNOOP_USE_METADATA)
snoop_flags |= SNOOP_USE_METADATA;
break;
default:
ret = -ENOTTY;
break;
} }
done: done:
spin_unlock_irqrestore(&dd->hfi1_snoop.snoop_lock, flags); spin_unlock_irqrestore(&dd->hfi1_snoop.snoop_lock, flags);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7