l2tp: fix incorrect parameter validation in the pppol2tp_getsockopt() function
BugLink: https://bugs.launchpad.net/bugs/2060097
[ Upstream commit 955e9876ba4ee26eeaab1b13517f5b2c88e73d55 ]
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>
(cherry picked from commit 393f4d390ec0ef839ebda8d63ff720f90493fb5c)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
This commit is contained in:
committed by
Roxana Nicolescu
parent
f731c6586f
commit
42a7243a89
+2
-2
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user