From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 DAB925FBB5; Tue, 13 Feb 2024 17:23:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707845024; cv=none; b=OkYUHDl0x7wTFPqodCXhHtuRy9HeRzEi0qK4dx8t87/0XVUit+VluBxt8+Ot06ruf9MtT6tUtt2zWHk2VK16p3r/feGP5z6DN+Em+18d6Xg0WrJ3AYqECywmggJbiJR0FFsEgyjbrw3Z+bRDVaORQkX/oENs+wTZInVdJuzQCu8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707845024; c=relaxed/simple; bh=FeROekUJdQIu6eU1fSHbTJqGt9sMAR7x7CL03d0iQoY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JrLvQqjm8zLOqn9dl6Jm3B3d9ZukvpOMupdHS7alFEPNhF+c7topMw7Z0JITOD8oMye8nxZD7s3+urd+/WEtnl14DLy8dWzeq+ZjQBSXHkiemPpcnYVvrRBw60ylxC34BxNRBtPzOvQkhnVpW2CHTuBSlJmFPMSxdyerRVLXL54= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cto+15eT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cto+15eT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F1D0C433F1; Tue, 13 Feb 2024 17:23:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1707845023; bh=FeROekUJdQIu6eU1fSHbTJqGt9sMAR7x7CL03d0iQoY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cto+15eTRxHuQGJf8xMeayvc+PlcNoutsEHVegEoXI4MHKKzH/shhsbDbSK8lADkf 3Ok2fO6Od/bDhrbcGhxqt8NtsAmc6O26YusRDq7LIAz6TnZADxr+Mxc89r3kP3byAP E5z5wV2pe5G+fNcUhu2WMux4JYIHuf/Q9VC4+Ta4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zhang Rui , Guenter Roeck , Sasha Levin Subject: [PATCH 6.1 23/64] hwmon: (coretemp) Fix out-of-bounds memory access Date: Tue, 13 Feb 2024 18:21:09 +0100 Message-ID: <20240213171845.474863012@linuxfoundation.org> X-Mailer: git-send-email 2.43.1 In-Reply-To: <20240213171844.702064831@linuxfoundation.org> References: <20240213171844.702064831@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhang Rui [ 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: Zhang Rui Cc: Link: https://lore.kernel.org/r/20240202092144.71180-2-rui.zhang@intel.com Signed-off-by: Guenter Roeck Stable-dep-of: fdaf0c8629d4 ("hwmon: (coretemp) Fix bogus core_id to attr name mapping") Signed-off-by: Sasha Levin --- drivers/hwmon/coretemp.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index 09aab5859fa7..a80ebf433f7c 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -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; -- 2.43.0