Skip to content

Commit 404ec60

Browse files
committed
ACPICA: Fix error code path in acpi_ds_call_control_method()
A use-after-free in acpi_ps_parse_aml() after a failing invocaion of acpi_ds_call_control_method() is reported by KASAN [1] and code inspection reveals that next_walk_state pushed to the thread by acpi_ds_create_walk_state() is freed on errors, but it is not popped from the thread beforehand. Thus acpi_ds_get_current_walk_state() called by acpi_ps_parse_aml() subsequently returns it as the new walk state which is incorrect. To address this, make acpi_ds_call_control_method() call acpi_ds_pop_walk_state() to pop next_walk_state from the thread before returning an error. Link: https://lore.kernel.org/linux-acpi/[email protected]/ # [1] Reported-by: Chen Zhongjin <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]> Reviewed-by: Chen Zhongjin <[email protected]>
1 parent 2b6bab6 commit 404ec60

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

drivers/acpi/acpica/dsmethod.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
517517
info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info));
518518
if (!info) {
519519
status = AE_NO_MEMORY;
520-
goto cleanup;
520+
goto pop_walk_state;
521521
}
522522

523523
info->parameters = &this_walk_state->operands[0];
@@ -529,7 +529,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
529529

530530
ACPI_FREE(info);
531531
if (ACPI_FAILURE(status)) {
532-
goto cleanup;
532+
goto pop_walk_state;
533533
}
534534

535535
next_walk_state->method_nesting_depth =
@@ -575,6 +575,12 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
575575

576576
return_ACPI_STATUS(status);
577577

578+
pop_walk_state:
579+
580+
/* On error, pop the walk state to be deleted from thread */
581+
582+
acpi_ds_pop_walk_state(thread);
583+
578584
cleanup:
579585

580586
/* On error, we must terminate the method properly */

0 commit comments

Comments
 (0)