From: Xin Long <lucien.xin@gmail.com>
To: network dev <netdev@vger.kernel.org>,
davem@davemloft.net, kuba@kernel.org
Cc: Eric Dumazet <edumazet@google.com>,
David Ahern <dsahern@gmail.com>, Paolo Abeni <pabeni@redhat.com>
Subject: [PATCH net] udp: fix the len check in udp_lib_getsockopt
Date: Thu, 27 May 2021 15:12:39 -0400 [thread overview]
Message-ID: <04cb0c7f6884224c99fbf656579250896af82d5b.1622142759.git.lucien.xin@gmail.com> (raw)
Currently, when calling UDP's getsockopt, it only makes sure 'len'
is not less than 0, then copys 'len' bytes back to usespace while
all data is 'int' type there.
If userspace sets 'len' with a value N (N < sizeof(int)), it will
only copy N bytes of the data to userspace with no error returned,
which doesn't seem right. Like in Chen Yi's case where N is 0, it
called getsockopt and got an incorrect value but with no error
returned.
The patch is to fix the len check and make sure it's not less than
sizeof(int). Otherwise, '-EINVAL' is returned, as it does in other
protocols like SCTP/TIPC.
Reported-by: Chen Yi <yiche@redhat.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
net/ipv4/udp.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 15f5504adf5b..90de2ac70ea9 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -2762,11 +2762,11 @@ int udp_lib_getsockopt(struct sock *sk, int level, int optname,
if (get_user(len, optlen))
return -EFAULT;
- len = min_t(unsigned int, len, sizeof(int));
-
- if (len < 0)
+ if (len < sizeof(int))
return -EINVAL;
+ len = sizeof(int);
+
switch (optname) {
case UDP_CORK:
val = up->corkflag;
--
2.27.0
next reply other threads:[~2021-05-27 19:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-27 19:12 Xin Long [this message]
2021-05-27 19:13 ` [PATCH net] udp: fix the len check in udp_lib_getsockopt Xin Long
2021-05-28 22:39 ` Jakub Kicinski
2021-05-29 1:47 ` Xin Long
2021-05-29 1:57 ` David Ahern
2021-05-29 16:47 ` Xin Long
2021-05-31 1:31 ` David Ahern
2021-05-31 2:02 ` Xin Long
2021-05-31 10:13 ` David Laight
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=04cb0c7f6884224c99fbf656579250896af82d5b.1622142759.git.lucien.xin@gmail.com \
--to=lucien.xin@gmail.com \
--cc=davem@davemloft.net \
--cc=dsahern@gmail.com \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/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).