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 0A6CCC3DA79 for ; Sun, 18 Dec 2022 16:12:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230470AbiLRQM4 (ORCPT ); Sun, 18 Dec 2022 11:12:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231752AbiLRQML (ORCPT ); Sun, 18 Dec 2022 11:12:11 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D18C9E008; Sun, 18 Dec 2022 08:05:28 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 98D1B60DD4; Sun, 18 Dec 2022 16:05:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94328C433D2; Sun, 18 Dec 2022 16:05:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671379527; bh=PQTkkO2TEez+Hevl8IFWz7Fj4RaHB0oBJSP09rZ7HLc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jl9T4cejDSINBMoQaW0KUkM7eQS60erjo58sac9cQFs94DG9UuIcYWvrT6BMoxJ+L 7sfiEooDYn0KIhygHOrnM1t4v20QCbOgLkQdaxxhVh+Rl7Y6MPEt/7vnRg9gqhYwHY WeqLg/7S62yvQ64+L9yu1q7xBlqFVrg1oV4xrwONpvJIuogWOT4hWRnl62DQt6KKBT 2QZ5d1BB+A2yFVZRdm6NLFTCxNOGjIFq4B1NoaU/Fj/vteNbBsz8IkVguEmzbWggFp Ztfeg8uwSJCvSoeu2pQKDS+E5gsF/Jh2pXspy1XKpYSWsD3SN20zwiqvGiqWG3nbEr K4gfsDaJk+Trw== 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, ast@kernel.org, f.fainelli@gmail.com, trix@redhat.com, marco@mebeim.net, wsa+renesas@sang-engineering.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 57/85] ethtool: avoiding integer overflow in ethtool_phys_id() Date: Sun, 18 Dec 2022 11:01:14 -0500 Message-Id: <20221218160142.925394-57-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221218160142.925394-1-sashal@kernel.org> References: <20221218160142.925394-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: netdev@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 57e7238a4136..81fe2422fe58 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -2008,7 +2008,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