From: Yang Shi <yang@os.amperecomputing.com>
To: catalin.marinas@arm.com, will@kernel.org, ryan.roberts@arm.com
Cc: yang@os.amperecomputing.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] arm64: kprobes: check the return value of set_memory_rox()
Date: Mon, 3 Nov 2025 11:45:05 -0800 [thread overview]
Message-ID: <20251103194505.4077265-1-yang@os.amperecomputing.com> (raw)
Since commit a166563e7ec3 ("arm64: mm: support large block mapping when
rodata=full"), __change_memory_common has more chance to fail due to
memory allocation fialure when splitting page table. So check the return
value of set_memory_rox(), then bail out if it fails otherwise we may have
RW memory mapping for kprobes insn page.
Fixes: 195a1b7d8388 ("arm64: kprobes: call set_memory_rox() for kprobe page")
Signed-off-by: Yang Shi <yang@os.amperecomputing.com>
---
I actually epxected 195a1b7d8388 ("arm64: kprobes: call set_memory_rox()
for kprobe page") can be merged in 6.17-rcX, so I just restored it to
before commit 10d5e97c1bf8 ("arm64: use PAGE_KERNEL_ROX directly in
alloc_insn_page"), however it turned out to be merged in 6.18-rc1 and it
is after commit a166563e7ec3 ("arm64: mm: support large block mapping when
rodata=full"). So I made the fix tag point to it.
And I don't think we need to backport this patch to pre-6.18.
arch/arm64/kernel/probes/kprobes.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c
index 8ab6104a4883..43a0361a8bf0 100644
--- a/arch/arm64/kernel/probes/kprobes.c
+++ b/arch/arm64/kernel/probes/kprobes.c
@@ -49,7 +49,10 @@ void *alloc_insn_page(void)
addr = execmem_alloc(EXECMEM_KPROBES, PAGE_SIZE);
if (!addr)
return NULL;
- set_memory_rox((unsigned long)addr, 1);
+ if (set_memory_rox((unsigned long)addr, 1)) {
+ execmem_free(addr);
+ return NULL;
+ }
return addr;
}
--
2.47.0
next reply other threads:[~2025-11-03 19:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-03 19:45 Yang Shi [this message]
2025-11-04 10:41 ` [PATCH] arm64: kprobes: check the return value of set_memory_rox() Punit Agrawal
2025-11-04 15:57 ` Yang Shi
2025-11-04 13:14 ` Ryan Roberts
2025-11-04 13:44 ` Ryan Roberts
2025-11-04 16:00 ` Yang Shi
2025-11-04 14:02 ` Dev Jain
2025-11-04 16:16 ` Yang Shi
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=20251103194505.4077265-1-yang@os.amperecomputing.com \
--to=yang@os.amperecomputing.com \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ryan.roberts@arm.com \
--cc=will@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