]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
PM: hibernate: Add error handling for syscore_suspend()
authorWentao Liang <vulab@iscas.ac.cn>
Sun, 19 Jan 2025 14:32:05 +0000 (22:32 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 23 Jan 2025 20:16:50 +0000 (21:16 +0100)
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 <vulab@iscas.ac.cn>
Link: https://patch.msgid.link/20250119143205.2103-1-vulab@iscas.ac.cn
[ rjw: Changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
kernel/power/hibernate.c

index 1f87aa01ba44f00096f05d41ab3043dbc2428f6a..10a01af63a8079f74c3bc4456c62ea6361b1cc25 100644 (file)
@@ -608,7 +608,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;
@@ -620,6 +624,7 @@ int hibernation_platform_enter(void)
 
  Power_up:
        syscore_resume();
+ Enable_irqs:
        system_state = SYSTEM_RUNNING;
        local_irq_enable();