From: Jordan Niethe <jniethe5@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: ajd@linux.ibm.com, cmr@codefail.de, npiggin@gmail.com,
naveen.n.rao@linux.ibm.com, Jordan Niethe <jniethe5@gmail.com>,
dja@axtens.net
Subject: [PATCH v10 04/10] powerpc/kprobes: Mark newly allocated probes as ROX
Date: Tue, 30 Mar 2021 15:51:26 +1100 [thread overview]
Message-ID: <20210330045132.722243-5-jniethe5@gmail.com> (raw)
In-Reply-To: <20210330045132.722243-1-jniethe5@gmail.com>
From: Russell Currey <ruscur@russell.cc>
Add the arch specific insn page allocator for powerpc. This allocates
ROX pages if STRICT_KERNEL_RWX is enabled. These pages are only written
to with patch_instruction() which is able to write RO pages.
Reviewed-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Russell Currey <ruscur@russell.cc>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
[jpn: Reword commit message, switch to __vmalloc_node_range()]
Signed-off-by: Jordan Niethe <jniethe5@gmail.com>
---
v9: - vmalloc_exec() no longer exists
- Set the page to RW before freeing it
v10: - use __vmalloc_node_range()
---
arch/powerpc/kernel/kprobes.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index 01ab2163659e..3ae27af9b094 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -25,6 +25,7 @@
#include <asm/sections.h>
#include <asm/inst.h>
#include <linux/uaccess.h>
+#include <linux/vmalloc.h>
DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;
DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
@@ -103,6 +104,19 @@ kprobe_opcode_t *kprobe_lookup_name(const char *name, unsigned int offset)
return addr;
}
+void *alloc_insn_page(void)
+{
+ if (IS_ENABLED(CONFIG_STRICT_KERNEL_RWX)) {
+ return __vmalloc_node_range(PAGE_SIZE, 1, MODULES_VADDR, MODULES_END,
+ GFP_KERNEL, PAGE_KERNEL_ROX, VM_FLUSH_RESET_PERMS,
+ NUMA_NO_NODE, __builtin_return_address(0));
+ } else {
+ return __vmalloc_node_range(PAGE_SIZE, 1, MODULES_VADDR, MODULES_END,
+ GFP_KERNEL, PAGE_KERNEL_EXEC, VM_FLUSH_RESET_PERMS,
+ NUMA_NO_NODE, __builtin_return_address(0));
+ }
+}
+
int arch_prepare_kprobe(struct kprobe *p)
{
int ret = 0;
--
2.25.1
next prev parent reply other threads:[~2021-03-30 4:53 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-30 4:51 [PATCH v10 00/10] powerpc: Further Strict RWX support Jordan Niethe
2021-03-30 4:51 ` [PATCH v10 01/10] powerpc/mm: Implement set_memory() routines Jordan Niethe
2021-03-30 5:16 ` Christophe Leroy
2021-04-21 2:51 ` Jordan Niethe
2021-03-31 11:16 ` Michael Ellerman
2021-03-31 12:03 ` Christophe Leroy
2021-04-21 5:03 ` Jordan Niethe
2021-04-01 4:37 ` Aneesh Kumar K.V
2021-04-21 5:19 ` Jordan Niethe
2021-03-30 4:51 ` [PATCH v10 02/10] powerpc/lib/code-patching: Set up Strict RWX patching earlier Jordan Niethe
2021-03-30 4:51 ` [PATCH v10 03/10] powerpc: Always define MODULES_{VADDR,END} Jordan Niethe
2021-03-30 5:00 ` Christophe Leroy
2021-04-01 13:36 ` Christophe Leroy
2021-04-21 2:46 ` Jordan Niethe
2021-04-21 5:14 ` Christophe Leroy
2021-04-21 5:22 ` Jordan Niethe
2021-03-30 4:51 ` Jordan Niethe [this message]
2021-03-30 5:05 ` [PATCH v10 04/10] powerpc/kprobes: Mark newly allocated probes as ROX Christophe Leroy
2021-04-21 2:39 ` Jordan Niethe
2021-03-30 4:51 ` [PATCH v10 05/10] powerpc/bpf: Write protect JIT code Jordan Niethe
2021-03-31 10:37 ` Michael Ellerman
2021-03-31 10:39 ` Christophe Leroy
2021-04-21 2:35 ` Jordan Niethe
2021-04-21 6:51 ` Michael Ellerman
2021-03-30 4:51 ` [PATCH v10 06/10] powerpc/mm/ptdump: debugfs handler for W+X checks at runtime Jordan Niethe
2021-03-31 11:24 ` Michael Ellerman
2021-04-21 2:23 ` Jordan Niethe
2021-04-21 5:16 ` Christophe Leroy
2021-03-30 4:51 ` [PATCH v10 07/10] powerpc: Set ARCH_HAS_STRICT_MODULE_RWX Jordan Niethe
2021-03-30 4:51 ` [PATCH v10 08/10] powerpc/configs: Enable STRICT_MODULE_RWX in skiroot_defconfig Jordan Niethe
2021-03-30 5:27 ` Christophe Leroy
2021-04-21 2:37 ` Jordan Niethe
2021-03-30 4:51 ` [PATCH v10 09/10] powerpc/mm: implement set_memory_attr() Jordan Niethe
2021-03-30 4:51 ` [PATCH v10 10/10] powerpc/32: use set_memory_attr() Jordan Niethe
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=20210330045132.722243-5-jniethe5@gmail.com \
--to=jniethe5@gmail.com \
--cc=ajd@linux.ibm.com \
--cc=cmr@codefail.de \
--cc=dja@axtens.net \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=naveen.n.rao@linux.ibm.com \
--cc=npiggin@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).