diff options
| author | Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru> | 2024-03-07 14:23:49 +0000 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2024-03-26 18:22:36 -0400 |
| commit | d909b53ff5b8f005b474b4417ee271f5a4adca94 (patch) | |
| tree | d76ba41a3a5a383856e813afa92ef87089db1292 | |
| parent | 95db6e62a2d920abf43c169e51046adb9f394ef0 (diff) | |
| download | linux-stable-d909b53ff5b8f005b474b4417ee271f5a4adca94.tar.gz linux-stable-d909b53ff5b8f005b474b4417ee271f5a4adca94.tar.bz2 linux-stable-d909b53ff5b8f005b474b4417ee271f5a4adca94.zip | |
tcp: fix incorrect parameter validation in the do_tcp_getsockopt() function
[ Upstream commit 716edc9706deb3bb2ff56e2eeb83559cea8f22db ]
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")
Signed-off-by: Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru>
Reviewed-by: Jason Xing <kerneljasonxing@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | net/ipv4/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 712186336997..3df973d22295 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3369,11 +3369,11 @@ static int do_tcp_getsockopt(struct sock *sk, int level, 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 TCP_MAXSEG: val = tp->mss_cache; |