Skip to content

Commit

Permalink
l2tp: fix incorrect parameter validation in the pppol2tp_getsockopt()…
Browse files Browse the repository at this point in the history
… function

[ 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: 3557baa ("[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>
  • Loading branch information
Gavrilov Ilia authored and Sasha Levin committed Mar 26, 2024
1 parent 1bd5ed4 commit a0fdfd5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/l2tp/l2tp_ppp.c
Expand Up @@ -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;
Expand Down

0 comments on commit a0fdfd5

Please sign in to comment.