Commit 26fef998 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f0eeb5f6 6fcab279

drivers/acpi/acpica/dsmethod.c

+7 −0
Original line number Diff line number Diff line
@@ -483,6 +483,13 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread, 
		return_ACPI_STATUS(AE_NULL_OBJECT);

	}



	if (this_walk_state->num_operands < obj_desc->method.param_count) {

		ACPI_ERROR((AE_INFO, "Missing argument for method [%4.4s]",

			    acpi_ut_get_node_name(method_node)));



		return_ACPI_STATUS(AE_AML_UNINITIALIZED_ARG);

	}



	/* Init for new method, possibly wait on method mutex */



	status =