From: Wang Hai <wanghaifine@gmail.com>
To: edumazet@google.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 <wanghaifine@gmail.com>
Subject: [PATCH] Change judgment len position
Date: Wed, 24 Oct 2018 23:47:29 +0800 [thread overview]
Message-ID: <20181024154729.5312-1-wanghaifine@gmail.com> (raw)
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@gmail.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
next reply other threads:[~2018-10-24 15:47 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-24 15:47 Wang Hai [this message]
2018-10-24 15:57 ` [PATCH] Change judgment len position Willy Tarreau
2018-10-24 16:23 ` Joe Perches
2018-10-24 16:32 ` Willy Tarreau
2018-10-24 16:54 ` Joe Perches
2018-10-24 17:03 ` Eric Dumazet
2018-10-24 17:18 ` Joe Perches
2018-10-24 20:09 ` Willy Tarreau
2018-10-24 15:59 ` Eric Dumazet
2018-10-24 16:01 ` Willy Tarreau
2018-10-24 17:10 ` David Miller
2018-10-24 18:28 ` Joe Perches
2018-10-24 20:48 ` Willy Tarreau
2018-10-24 23:46 ` Joe Perches
2018-10-25 0:02 ` David Miller
2018-10-25 0:23 ` Joe Perches
2018-10-25 0:50 ` Eric Dumazet
2018-10-25 1:11 ` Fengguang Wu
2018-10-25 1:16 ` Joe Perches
2018-10-25 2:20 ` Al Viro
2018-10-25 2:41 ` Joe Perches
2018-10-25 3:20 ` Willy Tarreau
2018-10-25 1:03 ` Al Viro
2018-10-24 17:34 ` kbuild test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181024154729.5312-1-wanghaifine@gmail.com \
--to=wanghaifine@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).