From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wang Hai Subject: [PATCH] Change judgment len position Date: Wed, 24 Oct 2018 23:47:29 +0800 Message-ID: <20181024154729.5312-1-wanghaifine@gmail.com> Cc: davem@davemloft.net, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Wang Hai To: edumazet@google.com Return-path: Received: from mail-pg1-f196.google.com ([209.85.215.196]:44376 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726449AbeJYAQX (ORCPT ); Wed, 24 Oct 2018 20:16:23 -0400 Sender: netdev-owner@vger.kernel.org List-ID: 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 --- 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