From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 9ED53231A37; Tue, 17 Jun 2025 16:47:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750178822; cv=none; b=K6r+5UZU0G05iqsEJKVXGUDZh/SMNDRbzRsPhqXwGfIZj5BV91Divh/rrytR/Pp6wXgstKDp9X9jV8kMH1zdB8KKG/mwoEoDHrq2nENHVrxSAhA4K18fGxMZwUBoXvPuTA2ySuuKY/vs6kpmzHcLyftgbPA0kmqFCwhbSQ/wkT0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750178822; c=relaxed/simple; bh=xN33zIqOwvLJxjNl+JFQZ5r842kAKbry7zi7WijVIrQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RD1i7iOUwUFr9/VmtifCY3KnNevLMdAB8KWZjPP9aCHSd+vRHDhds2norqNggJ4xge4+2kbsooUkTUQpFXzCuBcWPRSFUnyt1RM9vLlm3UDDvVASdphjREqn3ACHUIyLK9Qno30D2xF1+VH4drKsxEnstDxQw1+FhhxgwS8EPOY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=uI/WF+9G; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="uI/WF+9G" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1FED2C4CEE3; Tue, 17 Jun 2025 16:47:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750178822; bh=xN33zIqOwvLJxjNl+JFQZ5r842kAKbry7zi7WijVIrQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uI/WF+9GFrP42Gvo/Hm4X2pVuKnmFD/iBnS+SgKHPmjEMmzkP/yDalLNzjREkZz7m erXM8ceNKZQRgjHtDFVutzsaOJEC6bsVSwfxU1wZgT0uJzNxqqqjCRnBFw+p6f6Av9 Tp6ZHQvma5FClr2hEfjvyN72AweWhlx6d7FlvOkc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dan Carpenter , Simon Horman , Paolo Abeni , Sasha Levin Subject: [PATCH 6.15 564/780] net/mlx4_en: Prevent potential integer overflow calculating Hz Date: Tue, 17 Jun 2025 17:24:32 +0200 Message-ID: <20250617152514.453706704@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617152451.485330293@linuxfoundation.org> References: <20250617152451.485330293@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Carpenter [ Upstream commit 54d34165b4f786d7fea8412a18fb4a54c1eab623 ] The "freq" variable is in terms of MHz and "max_val_cycles" is in terms of Hz. The fact that "max_val_cycles" is a u64 suggests that support for high frequency is intended but the "freq_khz * 1000" would overflow the u32 type if we went above 4GHz. Use unsigned long long type for the mutliplication to prevent that. Fixes: 31c128b66e5b ("net/mlx4_en: Choose time-stamping shift value according to HW frequency") Signed-off-by: Dan Carpenter Reviewed-by: Simon Horman Link: https://patch.msgid.link/aDbFHe19juIJKjsb@stanley.mountain Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx4/en_clock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_clock.c b/drivers/net/ethernet/mellanox/mlx4/en_clock.c index cd754cd76bde1..d73a2044dc266 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_clock.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_clock.c @@ -249,7 +249,7 @@ static const struct ptp_clock_info mlx4_en_ptp_clock_info = { static u32 freq_to_shift(u16 freq) { u32 freq_khz = freq * 1000; - u64 max_val_cycles = freq_khz * 1000 * MLX4_EN_WRAP_AROUND_SEC; + u64 max_val_cycles = freq_khz * 1000ULL * MLX4_EN_WRAP_AROUND_SEC; u64 max_val_cycles_rounded = 1ULL << fls64(max_val_cycles - 1); /* calculate max possible multiplier in order to fit in 64bit */ u64 max_mul = div64_u64(ULLONG_MAX, max_val_cycles_rounded); -- 2.39.5