Skip to content

Commit 26fef99

Browse files
committed
Merge tag 'acpi-6.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki: "Fix a crash in ACPICA while attempting to evaluate a control method that expects more arguments than are being passed to it, which was exposed by a defective firmware update from a prominent OEM on multiple systems (Rafael Wysocki)" * tag 'acpi-6.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPICA: Refuse to evaluate a method if arguments are missing
2 parents f0eeb5f + 6fcab27 commit 26fef99

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

drivers/acpi/acpica/dsmethod.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,13 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
483483
return_ACPI_STATUS(AE_NULL_OBJECT);
484484
}
485485

486+
if (this_walk_state->num_operands < obj_desc->method.param_count) {
487+
ACPI_ERROR((AE_INFO, "Missing argument for method [%4.4s]",
488+
acpi_ut_get_node_name(method_node)));
489+
490+
return_ACPI_STATUS(AE_AML_UNINITIALIZED_ARG);
491+
}
492+
486493
/* Init for new method, possibly wait on method mutex */
487494

488495
status =

0 commit comments

Comments
 (0)