From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 6E71C3B1EFC; Tue, 21 Jul 2026 20:32:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784665951; cv=none; b=ovroUwsMlkO0O/LVJA9qPArp3yRL+9cuQwK7GJyUvWhaHgbzlm3EQeG/Y9xqOwGihtOjfD+CoiWPAiS2svRIKQZ0e2MoOXO5/KMa8sveknf3OPbbW7YbLCojFhfe0ia8vwG1U8eg1+ztotosVpxAVky6dYjYtd9qqv8lUkALOPc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784665951; c=relaxed/simple; bh=UzTnldKxGi8s1aQfKLSbThadftV+zcKfRxUANOX72uU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NxhbiqnrYl042Qn+IT7EYPE0CospoZVNbzdv+/+RD88xj7RFMu6UhLSVjOh1N2LTOEuJnicSMo0u835Ma/05IHjS69YvHXSSi8WG/b3U5xg/SUIUscytjpLeGPxzlbaTkKo2euKFQFPni6AeFy1IPtAthGZ5zyJAdkQoXtuLC2w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JP/s5zWM; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="JP/s5zWM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE8911F000E9; Tue, 21 Jul 2026 20:32:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784665950; bh=C7Kn495sk/5yFeiczLgrDUPI3qElwEgXnb5D5igFTBw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JP/s5zWMZuUfBx53CLx1YkmdWKp6amEiI/yZ3+eMRpVjTLvSjnk9xbHEdVm2mzJEf Lfgw5dc/Ip6VobvqlmCiGjBCkJmzbku3LspyPhtYVlWlK5mD2ISXaEdfyF5qLGgR0o hB7Mtvz89nsDnYluUmr3VD/+UeCNz0Z2N456bt8o= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, zhoumin , Tony Luck , Sasha Levin Subject: [PATCH 6.6 0461/1266] EDAC/{skx_common,skx}: Fix UBSAN shift-out-of-bounds in skx_get_dimm_info Date: Tue, 21 Jul 2026 17:14:58 +0200 Message-ID: <20260721152452.150425478@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152441.786066624@linuxfoundation.org> References: <20260721152441.786066624@linuxfoundation.org> User-Agent: quilt/0.69 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: zhoumin [ Upstream commit c63ed6e1f5fe648a4a099b6717f679999be482ef ] When the skx_get_dimm_attr() helper returns -EINVAL, skx_get_dimm_info() does not validate these return values before using them in a shift operation: size = ((1ull << (rows + cols + ranks)) * banks) >> (20 - 3); If all three values are -22, the shift exponent becomes -66, triggering a UBSAN shift-out-of-bounds error: UBSAN: shift-out-of-bounds in drivers/edac/skx_common.c shift exponent -66 is negative Fixes: 88a242c98740 ("EDAC, skx_common: Separate common code out from skx_edac") Signed-off-by: zhoumin Signed-off-by: Tony Luck Link: https://patch.msgid.link/tencent_2A0CC835A18366643CBD2865B169948AB409@qq.com Signed-off-by: Sasha Levin --- drivers/edac/skx_common.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/edac/skx_common.c b/drivers/edac/skx_common.c index 9e43aed72bd9fa..6b492ac8ba48ba 100644 --- a/drivers/edac/skx_common.c +++ b/drivers/edac/skx_common.c @@ -417,6 +417,9 @@ int skx_get_dimm_info(u32 mtr, u32 mcmtr, u32 amap, struct dimm_info *dimm, rows = numrow(mtr); cols = imc->hbm_mc ? 6 : numcol(mtr); + if (ranks < 0 || rows < 0 || cols < 0) + return 0; + if (imc->hbm_mc) { banks = 32; mtype = MEM_HBM2; -- 2.53.0