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 7555B482DB for ; Mon, 19 Feb 2024 18:53:44 +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=1708368824; cv=none; b=CVt6ITTUpyVBTlnrvei8bxXBFjfpXJgDoIqDoqNWjRXCfARUpNp+FFgila58BNP8wwPSial9zqyp7xCnAEveNYE97+obsiN7+64qht12OMHn1+VKDOeQLVXQDnrv1Ml7o8CFftkYEqbtVqu6/Qj3TBaNSvsjwZoRMmiGSJm/W4A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708368824; c=relaxed/simple; bh=OZH/g0yG713CIcDfvYU96IdPKEjNzBm2StJL5nwsf+A=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Lf33mWd7musOeoXB+aXtvFe8+i4xA+7gahod2YVGi492dQh7AEf6ZKV7QOFuqpsxBytJMQySjS14ZHI73PIDRkMBGhwpp/16hPVRq4fpWIqbKDlTQovTqU6B+InQ9njqVJ8x6w1ePfmbYsLhLFKgO5OGyQ7dcl/b55sVvsFtUNQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=qH5JuNdx; 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="qH5JuNdx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E84CC433C7; Mon, 19 Feb 2024 18:53:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708368824; bh=OZH/g0yG713CIcDfvYU96IdPKEjNzBm2StJL5nwsf+A=; h=Subject:To:Cc:From:Date:From; b=qH5JuNdxKDJS4klgk4kQkk5OfHBn+H3aDbSZgWtZNeeTqrzYP0HRmqI+1wt1CXOYN NKbpQzmKBi0Jl82dpb5pSNiLiNmqOPwlOwW5ZUpJ/oy6m0HwP7jfkpSnaMxOFp/5TF pBgOcZMn5wuTjygU85bQ+siFKKK0s5YEshNrNYr4= Subject: FAILED: patch "[PATCH] hwmon: (coretemp) Fix out-of-bounds memory access" failed to apply to 6.6-stable tree To: rui.zhang@intel.com,linux@roeck-us.net,stable@vger.kernel.org Cc: From: Date: Mon, 19 Feb 2024 19:53:37 +0100 Message-ID: <2024021937-revered-agreement-261e@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x 4e440abc894585a34c2904a32cd54af1742311b3 # git commit -s git send-email --to '' --in-reply-to '2024021937-revered-agreement-261e@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: 4e440abc8945 ("hwmon: (coretemp) Fix out-of-bounds memory access") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 4e440abc894585a34c2904a32cd54af1742311b3 Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Fri, 2 Feb 2024 17:21:34 +0800 Subject: [PATCH] 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 Cc: Link: https://lore.kernel.org/r/20240202092144.71180-2-rui.zhang@intel.com Signed-off-by: Guenter Roeck 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;