OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

hwmon: (coretemp) Fix out-of-bounds memory access 

[ Upstream commit 4e440abc894585a34c2904a32cd54af1742311b3 ]

Fix a bug that pdata->cpu_map[] is set before out-of-bounds check.
The problem might be triggered on systems with more than 128 cores per
package.

Fixes: 7108b80a54 ("hwmon/coretemp: Handle large core ID value")
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20240202092144.71180-2-rui.zhang@intel.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Stable-dep-of: fdaf0c8629d4 ("hwmon: (coretemp) Fix bogus core_id to attr name mapping")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Zhang Rui 2024-02-02 17:21:34 +08:00 committed by Greg Kroah-Hartman
parent a3156be201
commit 9bce694192
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/hwmon/coretemp.c
View File

@ -467,18 +467,14 @@ static int create_core_data(struct platform_device *pdev, unsigned int cpu,
if (pkg_flag) { if (pkg_flag) {
attr_no = PKG_SYSFS_ATTR_NO; attr_no = PKG_SYSFS_ATTR_NO;
} else { } else {
index = ida_alloc(&pdata->ida, GFP_KERNEL); index = ida_alloc_max(&pdata->ida, NUM_REAL_CORES - 1, GFP_KERNEL);
if (index < 0) if (index < 0)
return index; return index;
pdata->cpu_map[index] = topology_core_id(cpu); pdata->cpu_map[index] = topology_core_id(cpu);
attr_no = index + BASE_SYSFS_ATTR_NO; attr_no = index + BASE_SYSFS_ATTR_NO;
} }
if (attr_no > MAX_CORE_DATA - 1) {
err = -ERANGE;
goto ida_free;
}
tdata = init_temp_data(cpu, pkg_flag); tdata = init_temp_data(cpu, pkg_flag);
if (!tdata) { if (!tdata) {
err = -ENOMEM; err = -ENOMEM;