From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26DEBC4332F for ; Sun, 18 Dec 2022 16:51:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231701AbiLRQvc (ORCPT ); Sun, 18 Dec 2022 11:51:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231215AbiLRQuY (ORCPT ); Sun, 18 Dec 2022 11:50:24 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B30F61A21F; Sun, 18 Dec 2022 08:17:57 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 67FAEB801C0; Sun, 18 Dec 2022 16:17:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BABFFC433F0; Sun, 18 Dec 2022 16:17:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671380275; bh=Z9/utPV3HyJ/YyA51QPQTpU/ZGH62v8J49esyzJm1UA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hy9fzfR9G2fDonrCn5GT5hLRQQJla24JDCTp0qXzKJIoox4ithKW6azIfLQFTA1Ol Yb1uB+XunswmKKD8RrU0zLsF+dWMxh/1pNlfxUDFBDFhISjg0CfD9P0hvYpYBGxAm8 l9nn2D2rPkP5IpKVY6p0eZEA9nleyJcqBWjUfTGzGn2t1b10Id31GakR45x3tE1QTv RvkYduUww5d6MJ7dJpDRdWSNhLLQcn1yMZfKRnbCnumt/mzQAzc8cBxuJXu1cS9j/6 S4nWrs0sdQMKvfbRVb5TASdsGWCBXHogqLr4q3fhWp1nFDjnqFA+0cGxsz4Z1SWHTh IbJmojGnemzVw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Maxim Korotkov , Alexander Lobakin , Andrew Lunn , Jakub Kicinski , Sasha Levin , davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, mkl@pengutronix.de, marco@mebeim.net, sean.anderson@seco.com, trix@redhat.com, wsa+renesas@sang-engineering.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 29/39] ethtool: avoiding integer overflow in ethtool_phys_id() Date: Sun, 18 Dec 2022 11:15:49 -0500 Message-Id: <20221218161559.932604-29-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221218161559.932604-1-sashal@kernel.org> References: <20221218161559.932604-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Maxim Korotkov [ Upstream commit 64a8f8f7127da228d59a39e2c5e75f86590f90b4 ] The value of an arithmetic expression "n * id.data" is subject to possible overflow due to a failure to cast operands to a larger data type before performing arithmetic. Used macro for multiplication instead operator for avoiding overflow. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Maxim Korotkov Reviewed-by: Alexander Lobakin Reviewed-by: Andrew Lunn Link: https://lore.kernel.org/r/20221122122901.22294-1-korotkov.maxim.s@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ethtool/ioctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 80d2a00d3097..47c2dd4a9b9f 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -1966,7 +1966,8 @@ static int ethtool_phys_id(struct net_device *dev, void __user *useraddr) } else { /* Driver expects to be called at twice the frequency in rc */ int n = rc * 2, interval = HZ / n; - u64 count = n * id.data, i = 0; + u64 count = mul_u32_u32(n, id.data); + u64 i = 0; do { rtnl_lock(); -- 2.35.1