Reviewed-by: Cheng Jian cj.chengjian@huawei.com
在 2021/10/23 21:18, ws 写道:
From: Zhang Rui rui.zhang@intel.com
stable inclusion from stable-v5.10.44 commit afd87792db355282c4608356b98bb2dd650a6885 Bugzilla: https://bugzilla.openeuler.org/show_bug.cgi?id=438 CVE: NA
commit f1ffa9d4cccc8fdf6c03fb1b3429154d22037988 upstream.
Commit 95722237cb2a ("ACPI: sleep: Put the FACS table after using it") puts the FACS table during initialization.
But the hardware signature bits in the FACS table need to be accessed, after every hibernation, to compare with the original hardware signature.
So there is no reason to release the FACS table mapping after initialization.
This reverts commit 95722237cb2ae4f7b73471058cdb19e8f4057c93.
An alternative solution is to use acpi_gbl_FACS variable instead, which is mapped by the ACPICA core and never released.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=212277 Reported-by: Stephan Hohe sth.dev@tejp.de Signed-off-by: Zhang Rui rui.zhang@intel.com Cc: 5.8+ stable@vger.kernel.org # 5.8+ Signed-off-by: Rafael J. Wysocki rafael.j.wysocki@intel.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: ws 3045672234@qq.com
drivers/acpi/sleep.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index aff13bf4d947..31c9d0c8ae11 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -1290,10 +1290,8 @@ static void acpi_sleep_hibernate_setup(void) return;
acpi_get_table(ACPI_SIG_FACS, 1, (struct acpi_table_header **)&facs);
- if (facs) {
- if (facs) s4_hardware_signature = facs->hardware_signature;
acpi_put_table((struct acpi_table_header *)facs);- } } #else /* !CONFIG_HIBERNATION */ static inline void acpi_sleep_hibernate_setup(void) {}