mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 21:03:32 +00:00
net/x25: fix incorrect parameter validation in the x25_getsockopt() function
[ Upstream commitd6eb8de201
] 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:
parent
3627f21b9e
commit
e9b72f729d
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue