---

yaml --- r: 278259 b: refs/heads/master c: 10cae1c h: refs/heads/master i: 278257: 99aa64c 278255: fb0f4cc v: v3
git-mirror · Nov 29, 2011 · b96311a · b96311a
1 parent 6475f8f
commit b96311a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac1a1de31515d950f858ba47d2bba74ff9a2614d
+refs/heads/master: 10cae1c8dfbbdee55bdfcb7034f4c2c1197dc0a4
diff --git a/trunk/net/netrom/nr_route.c b/trunk/net/netrom/nr_route.c
@@ -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) {