ACPICA: Fix error code path in acpi_ds_call_control_method()
Subsystems (2)
PATCH 1/1 ACPICA: Fix error code path in acpi_ds_call_control_method()
From: Rafael J. Wysocki <[email protected]>
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.
--- drivers/acpi/acpica/dsmethod.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/acpi/acpica/dsmethod.c +8 -2
@@ -517,7 +517,7 @@ acpi_ds_call_control_method(struct acpi_ info =ACPI_ALLOCATE_ZEROED (sizeof (struct acpi_evaluate_info ));if (!info) { status =AE_NO_MEMORY ; - goto cleanup; + goto pop_walk_state; } info->parameters = &this_walk_state->operands[0 ];
@@ -529,7 +529,7 @@ acpi_ds_call_control_method(struct acpi_ACPI_FREE (info);if (ACPI_FAILURE (status)) { - goto cleanup; + goto pop_walk_state; } next_walk_state->method_nesting_depth =
@@ -575,6 +575,12 @@ acpi_ds_call_control_method(struct acpi_return_ACPI_STATUS (status); +pop_walk_state: + +/* On error, pop the walk state to be deleted from thread */ + +acpi_ds_pop_walk_state (thread); + cleanup:/* On error, we must terminate the method properly */
Quoted 48 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
A use-after-free in
acpi_ps_parse_aml()after a failing invocaion ofacpi_ds_call_control_method()is reported by KASAN [1] and code inspection reveals thatnext_walk_statepushed to the thread byacpi_ds_create_walk_state()is freed on errors, but it is not popped from the thread beforehand. Thusacpi_ds_get_current_walk_state()called byacpi_ps_parse_aml()subsequently returns it as the new walk state which is incorrect.To address this, make
acpi_ds_call_control_method()callacpi_ds_pop_walk_state()to popnext_walk_statefrom the thread before returning an error.Reported-by Chen Zhongjin <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>--- drivers/acpi/acpica/dsmethod.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)Index:
linux-pm/drivers/acpi/acpica/dsmethod.c
===================================================================drivers/acpi/acpica/dsmethod.c +2
-2@@ -517,7 +517,7 @@ acpi_ds_call_control_method(struct acpi_ info =ACPI_ALLOCATE_ZEROED (sizeof (struct acpi_evaluate_info ));if (!info) { status =AE_NO_MEMORY ; - goto cleanup; + goto pop_walk_state; } info->parameters = &this_walk_state->operands[0 ];@@ -529,7 +529,7 @@ acpi_ds_call_control_method(struct acpi_ACPI_FREE (info);if (ACPI_FAILURE (status)) { - goto cleanup; + goto pop_walk_state; } next_walk_state->method_nesting_depth =@@ -575,6 +575,12 @@ acpi_ds_call_control_method(struct acpi_return_ACPI_STATUS (status);
drivers/acpi/acpica/dsmethod.c acpi_ds_call_control_method(struct acpi_ · line 586
Quoted 10 lines
drivers/acpi/acpica/dsmethod.c +6
-0+pop_walk_state: + +/* On error, pop the walk state to be deleted from thread */ + +acpi_ds_pop_walk_state (thread); + cleanup:/* On error, we must terminate the method properly */
LGTM