From: Michal Clapinski <mclapinski@google.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>,
Ard Biesheuvel <ardb@kernel.org>,
Michal Clapinski <mclapinski@google.com>,
Dan Williams <dan.j.williams@intel.com>,
Pasha Tatashin <pasha.tatashin@soleen.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/1] x86/boot/compressed: Fix avoiding memmap in physical KASLR
Date: Tue, 10 Jun 2025 23:41:40 +0200 [thread overview]
Message-ID: <20250610214140.2775339-1-mclapinski@google.com> (raw)
The intent of the code was to cancel KASLR if there are more than 4
memmap args. Unfortunately, it was only doing that if the memmap args
were comma delimited, not if they were entirely separate.
This change fixes it.
Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
I would like KASLR to support more than 4 memmap args. Do you think
I can just increase the MAX_MEMMAP_REGIONS or should I implement
support for the general case?
arch/x86/boot/compressed/kaslr.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
index f03d59ea6e40..4aa9c9781ca7 100644
--- a/arch/x86/boot/compressed/kaslr.c
+++ b/arch/x86/boot/compressed/kaslr.c
@@ -162,9 +162,6 @@ static void mem_avoid_memmap(char *str)
{
static int i;
- if (i >= MAX_MEMMAP_REGIONS)
- return;
-
while (str && (i < MAX_MEMMAP_REGIONS)) {
int rc;
u64 start, size;
--
2.50.0.rc0.642.g800a2b2222-goog
next reply other threads:[~2025-06-10 21:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-10 21:41 Michal Clapinski [this message]
2025-06-10 22:44 ` [PATCH 1/1] x86/boot/compressed: Fix avoiding memmap in physical KASLR Pasha Tatashin
2025-06-21 8:18 ` Ard Biesheuvel
2025-06-21 9:51 ` Michał Cłapiński
2025-07-02 15:57 ` Chris Li
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=20250610214140.2775339-1-mclapinski@google.com \
--to=mclapinski@google.com \
--cc=ardb@kernel.org \
--cc=bp@alien8.de \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pasha.tatashin@soleen.com \
--cc=tglx@linutronix.de \
--cc=x86@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