ACPI fix for 6.16-rc3

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).
 -----BEGIN PGP SIGNATURE-----
 
 iQFGBAABCAAwFiEEcM8Aw/RY0dgsiRUR7l+9nS/U47UFAmhWlw8SHHJqd0Byand5
 c29ja2kubmV0AAoJEO5fvZ0v1OO1/u4H/1NmPGqwO+n3Atg2Dj9M1F7EiyuTZA/X
 N/275JiixSZLG5VY+r5lUVjo92uoSrx62fdq+r0w24CDj/ATFDbtaxwWTuvCTJi2
 YqHVAATC8eYrAM6nSx+NUzY3dLJnQBYma8GyerMxIA6uSEMYNk0TIueuS5h3OvKt
 ye3m+Y7xAeOFSdEyG6nwqQ9V2bXRSFDKZ6QeDSmsTnrbcAR4zAOJd1/NG8Ca4L3g
 PGwXJ1zlrrmzuSk3NxxnmLaDJuDamyPVgLDPzdLvQ4jV4/phV9cn1a48uFiDgv5f
 qD9J9LK3D35yp06JsBGc9UIETbEPOBP+NTYG85ZfKShs0ZoOxhfyl2c=
 =rSU6
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2025-06-21 08:27:12 -07:00
commit 26fef998eb

View file

@ -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 =