korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit d6eb8de201 ]

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>
This commit is contained in:
Gavrilov Ilia 2024-03-07 14:23:50 +00:00 committed by Sasha Levin
parent 26843eefcf
commit e06f0d3f66
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/x25/af_x25.c
View File

@ -470,12 +470,12 @@ static int x25_getsockopt(struct socket *sock, int level, int optname,
if (get_user(len, optlen)) if (get_user(len, optlen))
goto out; goto out;
len = min_t(unsigned int, len, sizeof(int));
rc = -EINVAL; rc = -EINVAL;
if (len < 0) if (len < 0)
goto out; goto out;
len = min_t(unsigned int, len, sizeof(int));
rc = -EFAULT; rc = -EFAULT;
if (put_user(len, optlen)) if (put_user(len, optlen))
goto out; goto out;