net: kcm: fix incorrect parameter validation in the kcm_getsockopt) function

BugLink: https://bugs.launchpad.net/bugs/2060097

[ Upstream commit 3ed5f415133f9b7518fbe55ba9ae9a3f5e700929 ]

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: ab7ac4eb98 ("kcm: Kernel Connection Multiplexor module")
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 8b409c7cf3600ef3307fcde582d925fd1a6a76e8)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
This commit is contained in:
Gavrilov Ilia
2024-03-07 14:23:50 +00:00
committed by Roxana Nicolescu
parent 8c4b15b0b3
commit 7d5b51a14e
+2 -1
View File
@@ -1152,10 +1152,11 @@ static int kcm_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));
switch (optname) {
case KCM_RECV_DISABLE:
val = kcm->rx_disabled;