mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-11-27 03:55:37 +08:00
net/x25: fix incorrect parameter validation in the x25_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: 1da177e4c3
("Linux-2.6.12-rc2")
Signed-off-by: Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
3ed5f41513
commit
d6eb8de201
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user