Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1eb74c00 authored by Zhang Rui's avatar Zhang Rui Committed by Greg Kroah-Hartman
Browse files

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: 7108b80a542b ("hwmon/coretemp: Handle large core ID value")
Signed-off-by: default avatarZhang 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: default avatarGuenter Roeck <linux@roeck-us.net>
Stable-dep-of: fdaf0c8629d4 ("hwmon: (coretemp) Fix bogus core_id to attr name mapping")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 51d76b72

drivers/hwmon/coretemp.c

+2 −6
Original line number Diff line number Diff line
@@ -467,18 +467,14 @@ static int create_core_data(struct platform_device *pdev, unsigned int cpu, 
	if (pkg_flag) {

		attr_no = PKG_SYSFS_ATTR_NO;

	} else {

		index = ida_alloc(&pdata->ida, GFP_KERNEL);

		index = ida_alloc_max(&pdata->ida, NUM_REAL_CORES - 1, GFP_KERNEL);

		if (index < 0)

			return index;



		pdata->cpu_map[index] = topology_core_id(cpu);

		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);

	if (!tdata) {

		err = -ENOMEM;