From: Wentao Liang Date: Sun, 19 Jan 2025 14:32:05 +0000 (+0800) Subject: PM: hibernate: Add error handling for syscore_suspend() X-Git-Tag: v5.10.235~360 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98e74da1ae42d5c30abedb48c39ef7a6c9b4ac0e;p=thirdparty%2Fkernel%2Fstable.git PM: hibernate: Add error handling for syscore_suspend() [ Upstream commit e20a70c572539a486dbd91b225fa6a194a5e2122 ] In hibernation_platform_enter(), the code did not check the return value of syscore_suspend(), potentially leading to a situation where syscore_resume() would be called even if syscore_suspend() failed. This could cause unpredictable behavior or system instability. Modify the code sequence in question to properly handle errors returned by syscore_suspend(). If an error occurs in the suspend path, the code now jumps to label 'Enable_irqs' skipping the syscore_resume() call and only enabling interrupts after setting the system state to SYSTEM_RUNNING. Fixes: 40dc166cb5dd ("PM / Core: Introduce struct syscore_ops for core subsystems PM") Signed-off-by: Wentao Liang Link: https://patch.msgid.link/20250119143205.2103-1-vulab@iscas.ac.cn [ rjw: Changelog edits ] Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 59a1b126c369b..f2b2a2dcdb87b 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -590,7 +590,11 @@ int hibernation_platform_enter(void) local_irq_disable(); system_state = SYSTEM_SUSPEND; - syscore_suspend(); + + error = syscore_suspend(); + if (error) + goto Enable_irqs; + if (pm_wakeup_pending()) { error = -EAGAIN; goto Power_up; @@ -602,6 +606,7 @@ int hibernation_platform_enter(void) Power_up: syscore_resume(); + Enable_irqs: system_state = SYSTEM_RUNNING; local_irq_enable();