]> git.baikalelectronics.ru Git - kernel.git/commit
ACPICA: Fix error code path in acpi_ds_call_control_method()
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 7 Nov 2022 17:42:36 +0000 (18:42 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Jan 2023 10:41:34 +0000 (11:41 +0100)
commitc3c42c7e868c9c8547b4d6332521e829ab403cb1
tree7455b53ae9eb4fd4de3df45b169cd9858f76b29b
parentefad0e33ca3eb3a79f9efcebe54235fb0b28f0a4
ACPICA: Fix error code path in acpi_ds_call_control_method()

[ Upstream commit 404ec60438add1afadaffaed34bb5fe4ddcadd40 ]

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/20221019073443.248215-1-chenzhongjin@huawei.com/
Reported-by: Chen Zhongjin <chenzhongjin@huawei.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Chen Zhongjin <chenzhongjin@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/acpi/acpica/dsmethod.c