Commit 22fdba55 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Yang Yingliang
Browse files

PM: sleep: Fix error handling in dpm_prepare() 

stable inclusion
from stable-v5.10.210
commit 6db18971f73a8312ec547c32274c398e6ca36e14
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I97NIA
CVE: CVE-2023-52498

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6db18971f73a8312ec547c32274c398e6ca36e14



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

[ Upstream commit 544e737d ]

Commit 2aa36604 ("PM: sleep: Avoid calling put_device() under
dpm_list_mtx") forgot to update the while () loop termination
condition to also break the loop if error is nonzero, which
causes the loop to become infinite if device_prepare() returns
an error for one device.

Add the missing !error check.

Fixes: 2aa36604 ("PM: sleep: Avoid calling put_device() under dpm_list_mtx")
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reported-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Cc: All applicable <stable@vger.kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parent dcb7d3ed

drivers/base/power/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1897,7 +1897,7 @@ int dpm_prepare(pm_message_t state) 
	device_block_probing();



	mutex_lock(&dpm_list_mtx);

	while (!list_empty(&dpm_list)) {

	while (!list_empty(&dpm_list) && !error) {

		struct device *dev = to_device(dpm_list.next);



		get_device(dev);