From patchwork Thu Mar 7 14:23:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavrilov Ilia X-Patchwork-Id: 13585766 X-Patchwork-Delegate: kuba@kernel.org Received: from mx0.infotecs.ru (mx0.infotecs.ru [91.244.183.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C9FDE12F38E; Thu, 7 Mar 2024 14:23:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.244.183.115 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709821437; cv=none; b=DZNC0OW55ozbiWPa81mW+zhxRcAZRnIhI81vTLuvetzqwdTIz7EW/EuhznNJilwvOb58wpUtgW7uJn/Su80bIyjumEC1fZA0BOn++sdx2NAbRJoKCBzpbwZWk5sOkZq9wEpy/vQi0kKDSx5o2MDZffbmFCtQB2NQepguSDrOeVo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709821437; c=relaxed/simple; bh=ik4mZx5M3IIhRc3Lmc3wxa3pGWHfYhX4OQNjFJzgBtw=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=k4S9tz7xtXfWHFmoutkoyc70YXFbXdLZGhmPPPJCIvFb56nkTwp8Jb1UkdCnCQAQ/ipsCsuJcQ+vxDJriOC1h0/LqmDbiDco/UjieaLVcdF/+EQ4CfWebYyQ9VwdD2NldRGs7sQAGA21T4G5rowXHO7SxP07RGqVDcYZzXvwaM8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=infotecs.ru; spf=pass smtp.mailfrom=infotecs.ru; dkim=pass (1024-bit key) header.d=infotecs.ru header.i=@infotecs.ru header.b=oGEL0RdJ; arc=none smtp.client-ip=91.244.183.115 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=infotecs.ru Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=infotecs.ru Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=infotecs.ru header.i=@infotecs.ru header.b="oGEL0RdJ" Received: from mx0.infotecs-nt (localhost [127.0.0.1]) by mx0.infotecs.ru (Postfix) with ESMTP id 45FAD148BC8D; Thu, 7 Mar 2024 17:23:51 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx0.infotecs.ru 45FAD148BC8D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=infotecs.ru; s=mx; t=1709821431; bh=wLBmuF843sLrgBGQEjfgUIwkJeOumtJJVkyPbV28dCU=; h=From:To:CC:Subject:Date:References:In-Reply-To:From; b=oGEL0RdJXnZ2QgcH7GThdeDY4Ws4sAGVkwJ3hwANuvMK6nKdFIsz/9n9qq7fetTkx Zrb77yOGtxB4a7BTa6LJ3CEQRXtUY/8AmAQDql8H7JCu+TUNmi4/nG4iPXkrUgpUcE zMVrjPWkoI8L4NDz5IIAsQZdNQHrQ4LSKUm+Xe78= Received: from msk-exch-02.infotecs-nt (msk-exch-02.infotecs-nt [10.0.7.192]) by mx0.infotecs-nt (Postfix) with ESMTP id 43BE831923A8; Thu, 7 Mar 2024 17:23:51 +0300 (MSK) From: Gavrilov Ilia To: "David S. Miller" CC: Eric Dumazet , Jakub Kicinski , Paolo Abeni , David Howells , "Shigeru Yoshida" , Mina Almasry , Kuniyuki Iwashima , Tom Herbert , Simon Horman , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "lvc-project@linuxtesting.org" Subject: [PATCH net-next v2 5/6] net: kcm: fix incorrect parameter validation in the kcm_getsockopt) function Thread-Topic: [PATCH net-next v2 5/6] net: kcm: fix incorrect parameter validation in the kcm_getsockopt) function Thread-Index: AQHacJsTlBzhET07pkKLeUDmE/Hj1w== Date: Thu, 7 Mar 2024 14:23:50 +0000 Message-ID: <20240307142030.2708698-6-Ilia.Gavrilov@infotecs.ru> References: <20240307142030.2708698-1-Ilia.Gavrilov@infotecs.ru> In-Reply-To: <20240307142030.2708698-1-Ilia.Gavrilov@infotecs.ru> Accept-Language: ru-RU, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-exclaimer-md-config: 208ac3cd-1ed4-4982-a353-bdefac89ac0a Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-KLMS-Rule-ID: 5 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Status: not scanned, disabled by settings X-KLMS-AntiSpam-Interceptor-Info: not scanned X-KLMS-AntiPhishing: Clean, bases: 2024/03/07 13:22:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2024/03/07 10:14:00 #24028863 X-KLMS-AntiVirus-Status: Clean, skipped X-Patchwork-Delegate: kuba@kernel.org 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: ab7ac4eb9832 ("kcm: Kernel Connection Multiplexor module") Signed-off-by: Gavrilov Ilia --- net/kcm/kcmsock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index 1184d40167b8..eda933c09792 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -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;