From: "Mike Rapoport (Microsoft)" <rppt@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>,
Alexander Potapenko <glider@google.com>,
David Hildenbrand <david@kernel.org>,
Marco Elver <elver@google.com>,
"Rafael J. Wysocki" <rafael@kernel.org>
Cc: Dmitry Vyukov <dvyukov@google.com>, Len Brown <lenb@kernel.org>,
Mike Rapoport <rppt@kernel.org>, Pavel Machek <pavel@kernel.org>,
kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, linux-pm@vger.kernel.org
Subject: [PATCH v2 2/5] hibernation: ensure secretmem pages don't reach a snapshot
Date: Sat, 26 Sep 2026 12:26:31 +0300 [thread overview]
Message-ID: <20260926-hibernation-v2-2-235f69f3ab2a@kernel.org> (raw)
In-Reply-To: <20260926-hibernation-v2-0-235f69f3ab2a@kernel.org>
hibernation_available() checks for active secretmem users, but a secretmem
file can be created after this check and its pages may get into the
hibernation snapshot although they should not.
Recheck that hibernation_available() after userspace is frozen and abort
hibernation if it is not.
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
---
kernel/power/hibernate.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index d2479c69d71a..97de677e360f 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -412,6 +412,11 @@ int hibernation_snapshot(int platform_mode)
if (error)
goto Close;
+ if (!hibernation_available()) {
+ error = -EBUSY;
+ goto Thaw;
+ }
+
if (hibernation_test(TEST_FREEZER)) {
/*
--
2.53.0
next prev parent reply other threads:[~2026-09-26 9:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-26 9:26 [PATCH v2 0/5] hibernation: make safe_copy_page more robust and remove debug_pagealloc support Mike Rapoport (Microsoft)
2026-09-26 9:26 ` [PATCH v2 1/5] hibernation: make swsusp_page helpers static Mike Rapoport (Microsoft)
2026-09-26 9:26 ` Mike Rapoport (Microsoft) [this message]
2026-09-26 9:26 ` [PATCH v2 3/5] hibernate: handle potential errors in hibernate_{map,unmap}_page() Mike Rapoport (Microsoft)
2026-09-26 9:26 ` [PATCH v2 4/5] hibernation, KFENCE: explicitly map/unmap KFENCE pages Mike Rapoport (Microsoft)
2026-09-26 9:26 ` [PATCH v2 5/5] hibernation: make hibernation unavailable when debug_pagealloc is on Mike Rapoport (Microsoft)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260926-hibernation-v2-2-235f69f3ab2a@kernel.org \
--to=rppt@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=david@kernel.org \
--cc=dvyukov@google.com \
--cc=elver@google.com \
--cc=glider@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-pm@vger.kernel.org \
--cc=pavel@kernel.org \
--cc=rafael@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®