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 033C81F759F; Tue, 3 Dec 2024 14:58:07 +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=1733237888; cv=none; b=UHNt+owUO3yY54tyQYFk+VIju6IIgrCcvmsjPe2+Zomji9JR+oind866mMS+GW5sEENW6pxn6Mf2XIkE5+yPPeGEsCPSYRkJAmdh9P78l8iS9BTgLgIOmne90kTmSzyUb58vH6LWA3eNGCI5GJyPPRWl9SCDHTSQc5bXd6JApxI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733237888; c=relaxed/simple; bh=ZO4Y2fA/V6S0dHp8vRxtT8IZlwKdPtnc9BYE1gc49Gc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZkTrY0SOKkIrymbyomYhdoajr1yRQID+M3L0U4LjArfrd/ZP2dZpNZSXnwnJB1bycrcFwBf7nXJF1HBQ3pdr/dBTyQfUxWgpt0bEHfhDGly6rAZofXOE4qjiNDIHYMDfntkkhyLvfZboIehKOkLCf4WRMDQAhW53B/NGaFYDk/0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Q1fVtKZj; 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="Q1fVtKZj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F013C4CECF; Tue, 3 Dec 2024 14:58:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733237887; bh=ZO4Y2fA/V6S0dHp8vRxtT8IZlwKdPtnc9BYE1gc49Gc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q1fVtKZjW5ftQIBveH9CdEsLCqHrMoAZT06MXLHA5gQXPGObe/AG6u89CSDNDiO02 NG9fxH+QkLTTho9JlusN0fNBj2HuVUSs765RN4j08ejrkxXhtP/in5efEyDklZYB4l SkyIN9vTwccFDWLOQZt/dfu/Jzn/+J5dbEAfTJv4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Thompson , "Borislav Petkov (AMD)" , Shravan Kumar Ramani , Sasha Levin Subject: [PATCH 6.11 096/817] EDAC/bluefield: Fix potential integer overflow Date: Tue, 3 Dec 2024 15:34:28 +0100 Message-ID: <20241203143959.452618319@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203143955.605130076@linuxfoundation.org> References: <20241203143955.605130076@linuxfoundation.org> User-Agent: quilt/0.67 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.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Thompson [ 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 Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Shravan Kumar Ramani Link: https://lore.kernel.org/r/20240930151056.10158-1-davthompson@nvidia.com Signed-off-by: Sasha Levin --- 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 5b3164560648e..0e539c1073510 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