From nobody Sun Oct 5 20:04:27 2025 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 143DA2629D; Wed, 30 Jul 2025 06:31:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753857120; cv=none; b=M0K2nchhZFbLlOtSkmC3T+v/rWypYmdPSGGZ0viJV3V5hyim/DFEEsa5nrufNlHb/CjX291uBzPNqykiuX8edKE3mjL0qH2Q0V9TMpT2y9XTRR93OPEhsda1ohS/hFTT+wjjR57ZU6KWHCiTN5s1igBghXXmcBztSE9/qLRBlak= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753857120; c=relaxed/simple; bh=kxv5Gy1KyXxspx2uODeZUwYo5EVFmhwTBib9zYEQBIw=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=RBe/HeRZgYulUiPTJbLrl5kWyiM0qbkv9hRK0+G6jH5QXXC+0FTip84K+skvQHg6zrQj/fuI87JrklHmkYahaSv+42tqqKlK2EVyRA3/+2J8bMVemslgfSn5i80rO8JPwxhjU454e7R8L9kagv58uSj13KdngctvNHzMtuqhJtA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bAOsoTtC; arc=none smtp.client-ip=209.85.210.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bAOsoTtC" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-769a21bd4d5so1474132b3a.0; Tue, 29 Jul 2025 23:31:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753857118; x=1754461918; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:sender:from:to:cc:subject:date:message-id:reply-to; bh=uB3+SIO6qA8oyFlUumi5OJO3sZoV3HuBnZCYSn8E4dg=; b=bAOsoTtCv0tDEOL3vAQdoPteoY4vVfvrt25pytGoqWV4edB4Lax/jVhUrwyXXReRoI 7JdxJA39DYSSSEzTKlIEZHd9Kv+TIIxsr0hNZskgMUKNflzLKFTjh12NN5qV8D7WQsIf xH6AcJVebmZZ8YZhBHx4+QKZgBVmtxRKSpibp2EApSQ8QHcWnmE9+SeU5MMp1sHEmnbg BraVT+unNmwIX45aevWDnMCwtBxEkyIYsBykFCkbVmjiFiPS4ZLk4eJ7QfEiBj22sVg7 MFbjOhpr+O035OntpXi5eXoDyidSGdKyvVuA6G3D14jfZOsWDEgaGCpP170QEi/cVPjb r4Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753857118; x=1754461918; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=uB3+SIO6qA8oyFlUumi5OJO3sZoV3HuBnZCYSn8E4dg=; b=ZpbgFyVjo9XSWLtdrU9TecG8d/o80AQjhJoKf+TFD7AQuY+BO3fOsHfuZbfbWv5XZP cackxYOQhdGCqCi1mDzv9LS7TK+REOHIhz24EGmASqkF3FNbMWe4bFb7IWfxAkJBVLzy QoHrcxE9vvpNbCisgm8Qbj4wQwIgY1A2knkfKHaKfdemWKVStjl9oGKK2V2FGznVPbUJ 7E4N7jAtLHlSf3DCaP7A0N4HmKyCPmv65zuyb+w5MlFTaPRpF6VPrZRHOx64aZlxsN1R OQT7kF68K0OciU/fXLxYOsrg6Xj5Gm6K3H76u/PlodD32QiMVD/V7kAHYBMeE3i9B+Rt 681g== X-Forwarded-Encrypted: i=1; AJvYcCUS/+BciN+3WOJQ1tHeGHVHSK5cv3st7vqhiOdhzDNU42Tayc2XEXYWo+07UL/aPhxhfatQb39nsz1x@vger.kernel.org, AJvYcCV1f0sXtN4GqPof/dPCiCt3pORtncUEjsJkpyK++K8kpgzh5i/4jDmJZtym1TNAYlJyjO6C1kkrI+IS8/6k@vger.kernel.org X-Gm-Message-State: AOJu0YzzMbBoj6LzYouVsYG95/mc6hZT9bWf8VzOLXT5/t+mrHgDYrde wyQ1I+TzPiFoQLhTK/yva/GWRAx6ciRZ9hwMT13DyZcn+8HOVY7JzE6H X-Gm-Gg: ASbGncuerjnHJJubnG3acFhooQF5zWT9LxftES1VpoZKMDMSXxfSHVfpnw8CbAEraDr CoAqZxT34dHlyxD/mrCjoECMTh7Z76BR/lqmYwfv8v7UMRnOy78Fju1mg3Z1vVTXrq1vQss7DYC ILpK7Rf1ZN4RtEzzuU1DvkvLW2oWecFCBTwLw5K/ymc9kdPYmARIwSv3QWkOc3brdckUJaZpvr7 1m4tuD7v6G1ewachT8ATbwZepprNq61025NvAoWyvpJo7rtNtMDLmrh2YZCqkWjco9WsVFlvO7T LCSTaS5sJA0AbE1tLgqjFOZRqrT4dv8vWkVfMQA8RQN41ol1tanKTJc+isqXYlBLYuYdwL13j2L EAWKrBhfQooc1/krfyqKzKyUvWySvuKit/ui63ZOVze4Hy+mMaLE= X-Google-Smtp-Source: AGHT+IGNwnBA8YEqF5nvJyPxatvrwOdfNKJextLwZZjLL+IVGB134VLwbcX2uDhp9LYJQqI+fR2hjg== X-Received: by 2002:a05:6a00:1d9a:b0:748:fcfa:8bd5 with SMTP id d2e1a72fcca58-76ab1021910mr3523688b3a.3.1753857118212; Tue, 29 Jul 2025 23:31:58 -0700 (PDT) Received: from localhost (118-163-61-247.hinet-ip.hinet.net. [118.163.61.247]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76408feb6casm9687396b3a.59.2025.07.29.23.31.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jul 2025 23:31:57 -0700 (PDT) Sender: AceLan Kao From: "Chia-Lin Kao (AceLan)" To: Tony Luck , Borislav Petkov , James Morse , Mauro Carvalho Chehab , Robert Richter , Qiuxu Zhuo , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] EDAC/skx_common: Fix potential negative values in DIMM size calculation Date: Wed, 30 Jul 2025 14:31:55 +0800 Message-ID: <20250730063155.2612379-1-acelan.kao@canonical.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The skx_get_dimm_attr() function can return a negative error code, which is then assigned to 'ranks', 'rows', or 'cols'. [ 9.344702] EDAC DEBUG: skx_get_dimm_attr: bad ranks =3D 3 (raw=3D0xffff= ffff) [ 9.344703] EDAC DEBUG: skx_get_dimm_attr: bad rows =3D 7 (raw=3D0xfffff= fff) [ 9.344703] EDAC DEBUG: skx_get_dimm_attr: bad cols =3D 3 (raw=3D0xfffff= fff) [ 9.344704] ------------[ cut here ]------------ [ 9.344705] UBSAN: shift-out-of-bounds in drivers/edac/skx_common.c:453:2 [ 9.344707] shift exponent -66 is negative The 3 values, rows, cols, and ranks are all -EINVAL(-22), so this line (1ull << (rows + cols + ranks) would become (1ull << ((-22) + (-22) + (-22)) Which leads to shift exponent -66 error Add a check to ensure that 'ranks', 'rows', and 'cols' are not negative before they are used in the size calculation. This prevents the use of invalid values. Fixes: 88a242c98740 ("EDAC, skx_common: Separate common code out from skx_e= dac") Signed-off-by: Chia-Lin Kao (AceLan) --- 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 39c733dbc5b9..36dd14320d70 100644 --- a/drivers/edac/skx_common.c +++ b/drivers/edac/skx_common.c @@ -436,6 +436,9 @@ int skx_get_dimm_info(u32 mtr, u32 mcmtr, u32 amap, str= uct dimm_info *dimm, rows =3D numrow(mtr); cols =3D imc->hbm_mc ? 6 : numcol(mtr); =20 + if (ranks < 0 || rows < 0 || cols < 0) + return 0; + if (imc->hbm_mc) { banks =3D 32; mtype =3D MEM_HBM2; --=20 2.43.0