From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD7F17DA6A; Wed, 5 Feb 2025 14:34:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738766072; cv=none; b=NLW/KI3JwUPiLCEJw3YOimX6p9ONzPdd5LMo1xOrn8D2RpbI+It9pKaElkQ+FbaBHEhb8iWFYOjMEHe56GXFYwpVmXL7cwJZXl8PsNgMpJ9Vs9lgAXENxQBewEad6Feo+wqFVdQxdNWJFZTdd7AyqxKyrXVB2XCI25kH3G6NCD4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738766072; c=relaxed/simple; bh=lpTbS+BSlGIv4YnKYQHA2wVWg6xvCSNkshtq+SvbCo0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qMaPar4VEmLjrw/KrkIG07BQDjlcUwBmMaZKcI8P+ya9belUadDkA7dXq1QpmjnRRuvBT4thhb+dBwPLcNHOt+kKnIsma+/rGsMFChCTRNSihNCTBkr6CRKC9EOyAO497FuBeZdBuO0Kv8D5WpalC0DchcAmyFKcSP/FjSOTF2I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Kp2Azpla; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Kp2Azpla" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38E82C4CED1; Wed, 5 Feb 2025 14:34:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738766072; bh=lpTbS+BSlGIv4YnKYQHA2wVWg6xvCSNkshtq+SvbCo0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kp2Azplahjyel/S/1oR8z031e5VtOBBUrToDFU3Jq+oU9SsIZuONBWjpvOhw1AIDH oEmGHKd2+QgOXXPspecUdB6JrFZdS9sogoynyTzIJore9d4C6i/pxSMYAqPvPIitVO /WewRGnKqh4UcKSRZgxAwRjo+pIWaIp/4lHbd1CQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wentao Liang , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.6 327/393] PM: hibernate: Add error handling for syscore_suspend() Date: Wed, 5 Feb 2025 14:44:06 +0100 Message-ID: <20250205134432.824921009@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134420.279368572@linuxfoundation.org> References: <20250205134420.279368572@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wentao Liang [ 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 --- kernel/power/hibernate.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 8d35b9f9aaa3f..c2fc58938dee5 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -599,7 +599,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; @@ -611,6 +615,7 @@ int hibernation_platform_enter(void) Power_up: syscore_resume(); + Enable_irqs: system_state = SYSTEM_RUNNING; local_irq_enable(); -- 2.39.5