Commit-ID: c183a603e8d8a5a189729b77d0c623a3d5950e5f
Gitweb: http://git.kernel.org/tip/c183a603e8d8a5a189729b77d0c623a3d5950e5f
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Fri, 23 Sep 2016 17:08:04 +0200
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Fri, 23 Sep 2016 18:04:56 +0200
acpi: Fix broken error check in map_processor()
map_processor() checks the cpuid value returned by acpi_map_cpuid() for -1
but acpi_map_cpuid() returns -EINVAL in case of error.
As a consequence the error is ignored and the following access into percpu
data with that negative cpuid results in a boot crash.
This happens always when NR_CPUS/nr_cpu_ids is smaller than the number of
processors listed in the ACPI tables.
Use a proper error check for id < 0 so the function returns instead of
trying to map CPU#(-EINVAL).
Reported-by: Ingo Molnar <mingo@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Dou Liyang <douly.fnst@xxxxxxxxxxxxxx>
Cc: Gu Zheng <guz.fnst@xxxxxxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Tang Chen <tangchen@xxxxxxxxxxxxxx>
Cc: Zhu Guihua <zhugh.fnst@xxxxxxxxxxxxxx>
Cc: akpm@xxxxxxxxxxxxxxxxxxxx
Cc: chen.tang@xxxxxxxxxxxx
Cc: cl@xxxxxxxxx
Cc: gongzhaogang@xxxxxxxxxx
Cc: isimatu.yasuaki@xxxxxxxxxxxxxx
Cc: izumi.taku@xxxxxxxxxxxxxx
Cc: kamezawa.hiroyu@xxxxxxxxxxxxxx
Cc: len.brown@xxxxxxxxx
Cc: lenb@xxxxxxxxxx
Cc: linux-acpi@xxxxxxxxxxxxxxx
Cc: linux-mm@xxxxxxxxx
Cc: mika.j.penttila@xxxxxxxxx
Cc: rafael@xxxxxxxxxx
Cc: rjw@xxxxxxxxxxxxx
Cc: tj@xxxxxxxxxx
Cc: yasu.isimatu@xxxxxxxxx
Fixes: dc6db24d2476 ("x86/acpi: Set persistent cpuid <-> nodeid mapping when booting")
Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1609231705570.5640@nanos
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
drivers/acpi/processor_core.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 9ac265f..5c78ee1 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -284,7 +284,7 @@ EXPORT_SYMBOL_GPL(acpi_get_cpuid);
static bool __init
map_processor(acpi_handle handle, phys_cpuid_t *phys_id, int *cpuid)
{
- int type;
+ int type, id;
u32 acpi_id;
acpi_status status;
acpi_object_type acpi_type;
@@ -320,10 +320,11 @@ map_processor(acpi_handle handle, phys_cpuid_t *phys_id, int *cpuid)
type = (acpi_type == ACPI_TYPE_DEVICE) ? 1 : 0;
*phys_id = __acpi_get_phys_id(handle, type, acpi_id, false);
- *cpuid = acpi_map_cpuid(*phys_id, acpi_id);
- if (*cpuid == -1)
- return false;
+ id = acpi_map_cpuid(*phys_id, acpi_id);
+ if (id < 0)
+ return false;
+ *cpuid = id;
return true;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|