Commit 10cae1c8 authored by Ralf Baechle's avatar Ralf Baechle Committed by David S. Miller

NET: NETROM: Cleanup argument SIOCADDRT ioctl argument checking.

nr_route.ndigis is unsigned int so the nr_route.ndigis < 0 expression is
never true and can be dropped.  Doing the nr_ax25_dev_get call later
allows the nr_route.ndigis test to bail out without having to dev_put.
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Cc: Thomas Osterried <thomas@osterried.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ac1a1de3
...@@ -670,12 +670,10 @@ int nr_rt_ioctl(unsigned int cmd, void __user *arg) ...@@ -670,12 +670,10 @@ int nr_rt_ioctl(unsigned int cmd, void __user *arg)
case SIOCADDRT: case SIOCADDRT:
if (copy_from_user(&nr_route, arg, sizeof(struct nr_route_struct))) if (copy_from_user(&nr_route, arg, sizeof(struct nr_route_struct)))
return -EFAULT; return -EFAULT;
if ((dev = nr_ax25_dev_get(nr_route.device)) == NULL) if (nr_route.ndigis > AX25_MAX_DIGIS)
return -EINVAL; return -EINVAL;
if (nr_route.ndigis < 0 || nr_route.ndigis > AX25_MAX_DIGIS) { if ((dev = nr_ax25_dev_get(nr_route.device)) == NULL)
dev_put(dev);
return -EINVAL; return -EINVAL;
}
switch (nr_route.type) { switch (nr_route.type) {
case NETROM_NODE: case NETROM_NODE:
if (strnlen(nr_route.mnemonic, 7) == 7) { if (strnlen(nr_route.mnemonic, 7) == 7) {
......
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