| From 73faf74f0fd36de34cfc2e75555e736c315cf1a7 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 30 Sep 2024 11:10:56 -0400 |
| Subject: EDAC/bluefield: Fix potential integer overflow |
| |
| From: David Thompson <davthompson@nvidia.com> |
| |
| [ Upstream commit 1fe774a93b46bb029b8f6fa9d1f25affa53f06c6 ] |
| |
| The 64-bit argument for the "get DIMM info" SMC call consists of mem_ctrl_idx |
| left-shifted 16 bits and OR-ed with DIMM index. With mem_ctrl_idx defined as |
| 32-bits wide the left-shift operation truncates the upper 16 bits of |
| information during the calculation of the SMC argument. |
| |
| The mem_ctrl_idx stack variable must be defined as 64-bits wide to prevent any |
| potential integer overflow, i.e. loss of data from upper 16 bits. |
| |
| Fixes: 82413e562ea6 ("EDAC, mellanox: Add ECC support for BlueField DDR4") |
| Signed-off-by: David Thompson <davthompson@nvidia.com> |
| Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> |
| Reviewed-by: Shravan Kumar Ramani <shravankr@nvidia.com> |
| Link: https://lore.kernel.org/r/20240930151056.10158-1-davthompson@nvidia.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/edac/bluefield_edac.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/edac/bluefield_edac.c b/drivers/edac/bluefield_edac.c |
| index e4736eb37bfb3..0ef0489827682 100644 |
| --- a/drivers/edac/bluefield_edac.c |
| +++ b/drivers/edac/bluefield_edac.c |
| @@ -180,7 +180,7 @@ static void bluefield_edac_check(struct mem_ctl_info *mci) |
| static void bluefield_edac_init_dimms(struct mem_ctl_info *mci) |
| { |
| struct bluefield_edac_priv *priv = mci->pvt_info; |
| - int mem_ctrl_idx = mci->mc_idx; |
| + u64 mem_ctrl_idx = mci->mc_idx; |
| struct dimm_info *dimm; |
| u64 smc_info, smc_arg; |
| int is_empty = 1, i; |
| -- |
| 2.43.0 |
| |
