net/x25: fix incorrect parameter validation in the x25_getsockopt() function

BugLink: https://bugs.launchpad.net/bugs/2060097

[ Upstream commit d6eb8de2015f0c24822e47356f839167ebde2945 ]

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: 1da177e4c3 ("Linux-2.6.12-rc2")
Signed-off-by: Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 856c83241271ece3cbcf2758195acddf9b815891)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
This commit is contained in:
Gavrilov Ilia
2024-03-07 14:23:50 +00:00
committed by Roxana Nicolescu
parent 7d5b51a14e
commit 9248ea3a1b
+2 -2
View File
@@ -460,12 +460,12 @@ static int x25_getsockopt(struct socket *sock, int level, int optname,
if (get_user(len, optlen))
goto out;
len = min_t(unsigned int, len, sizeof(int));
rc = -EINVAL;
if (len < 0)
goto out;
len = min_t(unsigned int, len, sizeof(int));
rc = -EFAULT;
if (put_user(len, optlen))
goto out;