aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroel kluin <roel.kluin@gmail.com>2009-10-23 05:59:21 +0000
committerDavid S. Miller <davem@davemloft.net>2009-10-29 01:39:54 -0700
commit65a1c4fffaaf5ca166a1263d84ca664d5192cda6 (patch)
tree4b78359d2af0a8e0912addbdff6fa07856f25f95
parent091bb8ab51c668635d1a75359019005921676881 (diff)
downloadkernel_samsung_crespo-65a1c4fffaaf5ca166a1263d84ca664d5192cda6.tar.gz
kernel_samsung_crespo-65a1c4fffaaf5ca166a1263d84ca664d5192cda6.tar.bz2
kernel_samsung_crespo-65a1c4fffaaf5ca166a1263d84ca664d5192cda6.zip
net: Cleanup redundant tests on unsigned
optlen is unsigned so the `< 0' test is never true. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/can/raw.c2
-rw-r--r--net/compat.c3
-rw-r--r--net/ipv4/ip_sockglue.c2
3 files changed, 1 insertions, 6 deletions
diff --git a/net/can/raw.c b/net/can/raw.c
index 962fc9f1d0c..6e77db58b9e 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -424,8 +424,6 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
if (level != SOL_CAN_RAW)
return -EINVAL;
- if (optlen < 0)
- return -EINVAL;
switch (optname) {
diff --git a/net/compat.c b/net/compat.c
index e13f5256fd2..6a2f75fb3f4 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -390,9 +390,6 @@ asmlinkage long compat_sys_setsockopt(int fd, int level, int optname,
int err;
struct socket *sock;
- if (optlen < 0)
- return -EINVAL;
-
if ((sock = sockfd_lookup(fd, &err))!=NULL)
{
err = security_socket_setsockopt(sock,level,optname);
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index a72f43ce33b..cafad9baff0 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -480,7 +480,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
case IP_OPTIONS:
{
struct ip_options *opt = NULL;
- if (optlen > 40 || optlen < 0)
+ if (optlen > 40)
goto e_inval;
err = ip_options_get_from_user(sock_net(sk), &opt,
optval, optlen);