Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

net/netrom/nr_route.c

+2 −4
Original line number Diff line number Diff line
@@ -670,12 +670,10 @@ int nr_rt_ioctl(unsigned int cmd, void __user *arg) 
	case SIOCADDRT:

		if (copy_from_user(&nr_route, arg, sizeof(struct nr_route_struct)))

			return -EFAULT;

		if ((dev = nr_ax25_dev_get(nr_route.device)) == NULL)

		if (nr_route.ndigis > AX25_MAX_DIGIS)

			return -EINVAL;

		if (nr_route.ndigis < 0 || nr_route.ndigis > AX25_MAX_DIGIS) {

			dev_put(dev);

		if ((dev = nr_ax25_dev_get(nr_route.device)) == NULL)

			return -EINVAL;

		}

		switch (nr_route.type) {

		case NETROM_NODE:

			if (strnlen(nr_route.mnemonic, 7) == 7) {