aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorGravatar Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru> 2024-03-07 14:23:50 +0000
committerGravatar David S. Miller <davem@davemloft.net> 2024-03-11 09:53:22 +0000
commit4bb3ba7b74fceec6f558745b25a43c6521cf5506 (patch)
tree4f4e3a72d0474c7fb17a0a1c38d16889bd619fe3 /net
parentl2tp: fix incorrect parameter validation in the pppol2tp_getsockopt() function (diff)
downloadlinux-4bb3ba7b74fceec6f558745b25a43c6521cf5506.tar.gz
linux-4bb3ba7b74fceec6f558745b25a43c6521cf5506.tar.bz2
linux-4bb3ba7b74fceec6f558745b25a43c6521cf5506.zip
udp: fix incorrect parameter validation in the udp_lib_getsockopt() function
The 'len' variable can't be negative when assigned the result of 'min_t' because all 'min_t' parameters are cast to unsigned int, and then the minimum one is chosen. To fix the logic, check 'len' as read from 'optlen', where the types of relevant variables are (signed) int. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Reviewed-by: Willem de Bruijn <willemb@google.com> Signed-off-by: Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/udp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 2beabf5b2d86..43ec4812b60e 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -2791,11 +2791,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)
return -EINVAL;
+ len = min_t(unsigned int, len, sizeof(int));
+
switch (optname) {
case UDP_CORK:
val = udp_test_bit(CORK, sk);