Skip to contentSkip to conversation

net: Cleanup redundant tests on unsigned

PATCH Applied Roel Kluin 2 participants 2 messages Oct 23, 2009 – Oct 29, 2009

Subsystems (4)
Networking Network drivers IPv4/IPv6 CAN network layer
lore
Share & tools
lore

Roel Kluin

author
#0 lore raw

PATCH 1/1 net: Cleanup redundant tests on unsigned

optlen is unsigned so the `< 0' test is never true.

Signed-off-by Roel Kluin <[email protected]>
---
 net/can/raw.c          |    2 --
 net/compat.c           |    3 ---
 net/ipv4/ip_sockglue.c |    2 +-
 3 files changed, 1 insertions(+), 6 deletions(-)

Or should the tests in net/can/raw.c or net/compat.c be replaced by something else?

net/can/raw.c +0 -2
index b5e8979..9e18c2a 100644
@@ -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) {
net/compat.c +0 -3
index a407c3a..e373995 100644
@@ -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);
net/ipv4/ip_sockglue.c +1 -1
index e982b5c..15dbf30 100644
@@ -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);