[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20181024154729.5312-1-wanghaifine@gmail.com>
Date: Wed, 24 Oct 2018 23:47:29 +0800
From: Wang Hai <wanghaifine@...il.com>
To: edumazet@...gle.com
Cc: davem@...emloft.net, kuznet@....inr.ac.ru, yoshfuji@...ux-ipv6.org,
netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
Wang Hai <wanghaifine@...il.com>
Subject: [PATCH] Change judgment len position
To determine whether len is less than zero, it should be put before
the function min_t, because the return value of min_t is not likely
to be less than zero.
Signed-off-by: Wang Hai <wanghaifine@...il.com>
---
net/ipv4/tcp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 10c624639..49af9fdc3 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3301,11 +3301,11 @@ static int do_tcp_getsockopt(struct sock *sk, int level,
struct net *net = sock_net(sk);
int val, len;
+ len = min_t(unsigned int, len, sizeof(int));
+
if (get_user(len, optlen))
return -EFAULT;
- len = min_t(unsigned int, len, sizeof(int));
-
if (len < 0)
return -EINVAL;
--
2.17.1
Powered by blists - more mailing lists