summaryrefslogtreecommitdiff
path: root/net/x25
diff options
context:
space:
mode:
authorroel kluin <roel.kluin@gmail.com>2009-10-23 05:21:56 +0000
committerDavid S. Miller <davem@davemloft.net>2009-10-29 01:39:53 -0700
commit091bb8ab51c668635d1a75359019005921676881 (patch)
tree6cecf1abd03209db800880cb090e24cdf58146e4 /net/x25
parent50e4fe91a5edbf680853b2ca37300a47ff860d63 (diff)
downloadlinux-3.10-091bb8ab51c668635d1a75359019005921676881.tar.gz
linux-3.10-091bb8ab51c668635d1a75359019005921676881.tar.bz2
linux-3.10-091bb8ab51c668635d1a75359019005921676881.zip
net: Cleanup redundant tests on unsigned
If there is data, the unsigned skb->len is greater than 0. rt.sigdigits is unsigned as well, so the test `>= 0' is always true, the other part of the test catches wrapped values. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/x25')
-rw-r--r--net/x25/x25_in.c2
-rw-r--r--net/x25/x25_route.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/x25/x25_in.c b/net/x25/x25_in.c
index 7d7c3abf38b..96d92278354 100644
--- a/net/x25/x25_in.c
+++ b/net/x25/x25_in.c
@@ -114,7 +114,7 @@ static int x25_state1_machine(struct sock *sk, struct sk_buff *skb, int frametyp
/*
* Copy any Call User Data.
*/
- if (skb->len >= 0) {
+ if (skb->len > 0) {
skb_copy_from_linear_data(skb,
x25->calluserdata.cuddata,
skb->len);
diff --git a/net/x25/x25_route.c b/net/x25/x25_route.c
index 2c999ccf504..66961ea28c9 100644
--- a/net/x25/x25_route.c
+++ b/net/x25/x25_route.c
@@ -190,7 +190,7 @@ int x25_route_ioctl(unsigned int cmd, void __user *arg)
goto out;
rc = -EINVAL;
- if (rt.sigdigits < 0 || rt.sigdigits > 15)
+ if (rt.sigdigits > 15)
goto out;
dev = x25_dev_get(rt.device);