diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2024-02-02 17:21:34 +0800 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2024-02-04 06:43:44 -0800 |
| commit | 4e440abc894585a34c2904a32cd54af1742311b3 (patch) | |
| tree | 33f78e5a9c6e0e538b790a2b954afe6d16e66275 /drivers | |
| parent | 1168491e7f53581ba7b6014a39a49cfbbb722feb (diff) | |
| download | linux-stable-4e440abc894585a34c2904a32cd54af1742311b3.tar.gz linux-stable-4e440abc894585a34c2904a32cd54af1742311b3.tar.bz2 linux-stable-4e440abc894585a34c2904a32cd54af1742311b3.zip | |
hwmon: (coretemp) Fix out-of-bounds memory access
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: 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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/coretemp.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index ba82d1e79c13..e78c76919111 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -509,18 +509,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; |