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 A91DE1442E8; Fri, 6 Dec 2024 14:53:36 +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=1733496816; cv=none; b=Ol5/YuQvpwQJT5nqsZhf8RzexHDe3wPZSczU+l3/Sus/RdGaGC4LVYEqPrb8Co7WKE8ey10/cFjkU6jLhPNqpg/t/VliPBv88fwXiKfdtuVvfHugId48T9gY2/LIUyic4DTeB3wL0QqKc1FLQMG3hYUPK8TXOmxz/O0prJHSduw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733496816; c=relaxed/simple; bh=RxGvZZqjMxP4kjl4guIQLNqwqSNG0ubeIuN3QBmD5Vs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bS8EXnu5dnc5e1RTQhHEYSSYBYRJbz4nC+q+BLOQYRRLzLSGHJKFyTLJvCNbWvHngV8iLfveAN/cb96+TJjH2EBa2f3Osf28b2Z1iNm2aIVo3E1nmhPqVlrOnVyvZmnhqhDDkIYPS3kVMO6S9rQNHaOoSXwNULQjBjZBr7U111E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rOFiyi+b; 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="rOFiyi+b" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23BA5C4CED1; Fri, 6 Dec 2024 14:53:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733496816; bh=RxGvZZqjMxP4kjl4guIQLNqwqSNG0ubeIuN3QBmD5Vs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rOFiyi+bUDTNrfRHOli9GJnW3BSn9/VzKH3RVQkHzi/UJ7F4ZMGfNY2ZmGlocJALh ZUhDlFp+nu2eaULiIQg2U2KA+JWguLNs9K70AllF2J31ahOLcf5afxB5TdB1I0WdXg B8j9DnmBfcGjKSsHYBqvlaXDq0bEXVLRuH1tf4gk= 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.6 081/676] EDAC/bluefield: Fix potential integer overflow Date: Fri, 6 Dec 2024 15:28:20 +0100 Message-ID: <20241206143656.529939063@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241206143653.344873888@linuxfoundation.org> References: <20241206143653.344873888@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 6.6-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