diff --git a/[refs] b/[refs] index ac6eed91b1c6..38f73b4b31be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50e4fe91a5edbf680853b2ca37300a47ff860d63 +refs/heads/master: 091bb8ab51c668635d1a75359019005921676881 diff --git a/trunk/net/x25/x25_in.c b/trunk/net/x25/x25_in.c index 7d7c3abf38b5..96d922783547 100644 --- a/trunk/net/x25/x25_in.c +++ b/trunk/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/trunk/net/x25/x25_route.c b/trunk/net/x25/x25_route.c index 2c999ccf504a..66961ea28c91 100644 --- a/trunk/net/x25/x25_route.c +++ b/trunk/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);