提交 4a717766 编写于 作者: R Rafael J. Wysocki 提交者: Xie XiuQi

PM: sleep: Fix possible overflow in pm_system_cancel_wakeup()

mainline inclusion
from mainline-v5.3-rc1
commit 2933954b
category: bugfix
bugzilla: 22356
CVE: NA

-------------------------------------------------

It is not actually guaranteed that pm_abort_suspend will be
nonzero when pm_system_cancel_wakeup() is called which may lead to
subtle issues, so make it use atomic_dec_if_positive() instead of
atomic_dec() for the safety sake.

Fixes: 33e4f80e ("ACPI / PM: Ignore spurious SCI wakeups from suspend-to-idle")
Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: NThomas Gleixner <tglx@linutronix.de>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: NHanjun Guo <guohanjun@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 0d1a90e2
...@@ -875,7 +875,7 @@ EXPORT_SYMBOL_GPL(pm_system_wakeup); ...@@ -875,7 +875,7 @@ EXPORT_SYMBOL_GPL(pm_system_wakeup);
void pm_system_cancel_wakeup(void) void pm_system_cancel_wakeup(void)
{ {
atomic_dec(&pm_abort_suspend); atomic_dec_if_positive(&pm_abort_suspend);
} }
void pm_wakeup_clear(bool reset) void pm_wakeup_clear(bool reset)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册