From: Yicong Yang <yangyicong@huawei.com>
To: <rafael@kernel.org>, <lenb@kernel.org>, <linux-acpi@vger.kernel.org>
Cc: <jmeurin@google.com>, <jeremy.linton@arm.com>,
<jonathan.cameron@huawei.com>, <zhanjie9@hisilicon.com>,
<prime.zeng@hisilicon.com>, <yangyicong@hisilicon.com>,
<linuxarm@huawei.com>
Subject: [PATCH] ACPI: PPTT: Fix table length check when parsing processor nodes
Date: Wed, 7 May 2025 11:51:24 +0800 [thread overview]
Message-ID: <20250507035124.28071-1-yangyicong@huawei.com> (raw)
From: Yicong Yang <yangyicong@hisilicon.com>
Below error is met on my board and QEMU VM on SMT or non-SMT machine:
ACPI PPTT: PPTT table found, but unable to locate core 31 (31)
This is because the processor node is found by iterating the PPTT
table under condition (for both acpi_find_processor_node() and
acpi_pptt_leaf_node()):
while (entry + proc_sz < table_end)
[parse the processor node]
If the last processor node is happened to be the last node in the
PPTT table, above condition will always be false since
entry + proc_sz == table_end. Thus the last CPU is not parsed.
Fix the loop condition to resolve the issue.
This issue is exposed by [1] but the root cause is explained above.
Before [1] entry + proc_sz is always smaller than table_end.
[1] 7ab4f0e37a0f ("ACPI PPTT: Fix coding mistakes in a couple of sizeof() calls")
Fixes: 2bd00bcd73e5 ("ACPI/PPTT: Add Processor Properties Topology Table parsing")
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
---
drivers/acpi/pptt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c
index f73ce6e13065..4364da90902e 100644
--- a/drivers/acpi/pptt.c
+++ b/drivers/acpi/pptt.c
@@ -231,7 +231,7 @@ static int acpi_pptt_leaf_node(struct acpi_table_header *table_hdr,
sizeof(struct acpi_table_pptt));
proc_sz = sizeof(struct acpi_pptt_processor);
- while ((unsigned long)entry + proc_sz < table_end) {
+ while ((unsigned long)entry + proc_sz <= table_end) {
cpu_node = (struct acpi_pptt_processor *)entry;
if (entry->type == ACPI_PPTT_TYPE_PROCESSOR &&
cpu_node->parent == node_entry)
@@ -273,7 +273,7 @@ static struct acpi_pptt_processor *acpi_find_processor_node(struct acpi_table_he
proc_sz = sizeof(struct acpi_pptt_processor);
/* find the processor structure associated with this cpuid */
- while ((unsigned long)entry + proc_sz < table_end) {
+ while ((unsigned long)entry + proc_sz <= table_end) {
cpu_node = (struct acpi_pptt_processor *)entry;
if (entry->length == 0) {
--
2.24.0
next reply other threads:[~2025-05-07 3:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-07 3:51 Yicong Yang [this message]
2025-05-07 11:40 ` [PATCH] ACPI: PPTT: Fix table length check when parsing processor nodes Sudeep Holla
2025-05-07 11:44 ` Rafael J. Wysocki
2025-05-07 11:47 ` Sudeep Holla
2025-05-07 11:51 ` Rafael J. Wysocki
2025-05-07 11:55 ` Sudeep Holla
2025-05-07 14:35 ` Jonathan Cameron
2025-05-07 15:35 ` Sudeep Holla
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250507035124.28071-1-yangyicong@huawei.com \
--to=yangyicong@huawei.com \
--cc=jeremy.linton@arm.com \
--cc=jmeurin@google.com \
--cc=jonathan.cameron@huawei.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=prime.zeng@hisilicon.com \
--cc=rafael@kernel.org \
--cc=yangyicong@hisilicon.com \
--cc=zhanjie9@hisilicon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox