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 C35D322969E; Thu, 12 Dec 2024 16:46:53 +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=1734022013; cv=none; b=txoDRFaSRzYx+ivfsXDxP/u8oHrROG14bpbI3rivYScnrXAm0aZDLgJI5NIoCNZFDmMIQVa/NXjy4VUjGMi8wtjtgpekTVqVbSF5lUxgfaS9nJXOciUq87SzQ9dDyYSYkySQCk+pn3xYqmvcfVEs4/SHBf4hDqT1soZzXFoi+aA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734022013; c=relaxed/simple; bh=FO1n7bZLT5zcNm8YMPf0JurQ2vrgfOqKIsM5agtN8Ww=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nAas4OLcxWyoxdwTSU04B02sF4Uim+2GBdnLhmeufAqkhBVP0JKnUVJbryjMz7jlpsc2bWxN71NQoJJvpKk154ea80qPEd9jd7rwU4LWk6oIeVQRIEwWZW3JwMR7/SbpQNZBtg3wV7vY3NQkfJjVi5JTj04dTai+of4Hm7fFJng= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=x3k391UR; 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="x3k391UR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2CE6AC4CECE; Thu, 12 Dec 2024 16:46:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734022013; bh=FO1n7bZLT5zcNm8YMPf0JurQ2vrgfOqKIsM5agtN8Ww=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x3k391URGySpYlyiaw+DXYrl9G20QlEIafcwZ+VTA+4FT2S87cxCJD4+/s2Ij7UuX e3jsYkBdMz46r4wti2exbxPZYLm18/Wo8ujk0HTTICsTH48Sgu94MVBJxgNqX3rqjg 13wdkKNTaLOSt7JRVd1lzD+rn/Hj3LDIJsBsFGNw= 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 5.15 093/565] EDAC/bluefield: Fix potential integer overflow Date: Thu, 12 Dec 2024 15:54:48 +0100 Message-ID: <20241212144315.160294693@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144311.432886635@linuxfoundation.org> References: <20241212144311.432886635@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-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 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