Commit e9dff11a authored by Hans de Goede's avatar Hans de Goede Committed by Rafael J. Wysocki
Browse files

ACPICA: dispatcher: Use acpi_ds_clear_operands() in acpi_ds_call_control_method() 

When deleting the previous walkstate operand stack
acpi_ds_call_control_method() was deleting obj_desc->Method.param_count
operands. But Method.param_count does not necessarily match
this_walk_state->num_operands, it may be either less or more.

After correcting the for loop to check `i < this_walk_state->num_operands`
the code is identical to acpi_ds_clear_operands(), so just outright
replace the code with acpi_ds_clear_operands() to fix this.

Link: https://github.com/acpica/acpica/commit/53fc0220


Signed-off-by: default avatarHans de Goede <hansg@kernel.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 22c65572

drivers/acpi/acpica/dsmethod.c

+1 −8
Original line number Diff line number Diff line
@@ -546,14 +546,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread, 
	 * Delete the operands on the previous walkstate operand stack

	 * (they were copied to new objects)

	 */

	for (i = 0; i < obj_desc->method.param_count; i++) {

		acpi_ut_remove_reference(this_walk_state->operands[i]);

		this_walk_state->operands[i] = NULL;

	}



	/* Clear the operand stack */



	this_walk_state->num_operands = 0;

	acpi_ds_clear_operands(this_walk_state);



	ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,

			  "**** Begin nested execution of [%4.4s] **** WalkState=%p\n",