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 D64F6216E0B; Thu, 12 Dec 2024 17:39:32 +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=1734025172; cv=none; b=PSnu1xxgwGNWuO1oUh5f7+JrboaNCWg3UmX9R2MYDFXmqLYSSRYX/1LNKTTJXPtxddPn8RYXnpb+xGf99KiPO8KL+6yLb5PDKmrN1rIWov+2v2HfBB4H1LnCxwFj/dc1jphDhk5cXUYjrlXrx5tQEG4jmx68YXlr7kZlZ+AoSkE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734025172; c=relaxed/simple; bh=gkGIUsIYtXWj70yrPDyT/JhWG7vifmVp7Y/IpGbqzZk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gS5bjRtpHRFGSmkRxRi8xzSME5YZoFu34HQcnCfJonBB0ZyhGO1C1R+0yK6CSM7HN+OSHX2Zqqf2cU3uRl7kSX4+4V1UAKwBfQ6NqlfrFzAUwJMIhg6/dcB6opn7BKzkoTL+2+4P4hmB3miSRVxapXqZqNmFMFG0/qIcEaH6HNI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NjKOUFPK; 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="NjKOUFPK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51AC0C4CECE; Thu, 12 Dec 2024 17:39:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734025172; bh=gkGIUsIYtXWj70yrPDyT/JhWG7vifmVp7Y/IpGbqzZk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NjKOUFPKt3hDKt5fJodbjURpJCdn5kN8GvGaz6Wk8vnvZdx2sI02a6VlZewe92/Y7 CjJhLvDGkpMaiJdaWvGHpT7sSsNGQL20ev/Wu/PhR2ezYwyGwhjl49clKsGACJDjEv bRPZnngnO5uKagrA5W4ANFL/9OErp3J146rLkrog= 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.4 040/321] EDAC/bluefield: Fix potential integer overflow Date: Thu, 12 Dec 2024 15:59:18 +0100 Message-ID: <20241212144231.579468993@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144229.291682835@linuxfoundation.org> References: <20241212144229.291682835@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.4-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