mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 04:47:05 +00:00
l2tp: fix incorrect parameter validation in the pppol2tp_getsockopt() function
[ Upstream commit955e9876ba
] 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:3557baabf2
("[L2TP]: PPP over L2TP driver core") Reviewed-by: Tom Parkin <tparkin@katalix.com> 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
e82ae490a9
commit
4865e9fb56
1 changed files with 2 additions and 2 deletions
|
@ -1356,11 +1356,11 @@ static int pppol2tp_getsockopt(struct socket *sock, int level, int optname,
|
|||
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));
|
||||
|
||||
err = -ENOTCONN;
|
||||
if (!sk->sk_user_data)
|
||||
goto end;
|
||||
|
|
Loading…
Reference in a new issue