All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jordan Niethe <jniethe5@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: ajd@linux.ibm.com, cmr@codefail.de, npiggin@gmail.com,
	aneesh.kumar@linux.ibm.com, naveen.n.rao@linux.ibm.com,
	Jordan Niethe <jniethe5@gmail.com>,
	dja@axtens.net
Subject: [PATCH v12 3/8] powerpc/kprobes: Mark newly allocated probes as ROX
Date: Thu,  6 May 2021 12:34:44 +1000	[thread overview]
Message-ID: <20210506023449.3568630-4-jniethe5@gmail.com> (raw)
In-Reply-To: <20210506023449.3568630-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()
v11: - Neaten up
v12: - Switch from __vmalloc_node_range() to module_alloc()
---
 arch/powerpc/kernel/kprobes.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index 01ab2163659e..73a294802f72 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -19,11 +19,13 @@
 #include <linux/extable.h>
 #include <linux/kdebug.h>
 #include <linux/slab.h>
+#include <linux/moduleloader.h>
 #include <asm/code-patching.h>
 #include <asm/cacheflush.h>
 #include <asm/sstep.h>
 #include <asm/sections.h>
 #include <asm/inst.h>
+#include <asm/set_memory.h>
 #include <linux/uaccess.h>
 
 DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;
@@ -103,6 +105,21 @@ kprobe_opcode_t *kprobe_lookup_name(const char *name, unsigned int offset)
 	return addr;
 }
 
+void *alloc_insn_page(void)
+{
+	void *page;
+
+	page = module_alloc(PAGE_SIZE);
+	if (!page)
+		return NULL;
+
+	if (IS_ENABLED(CONFIG_STRICT_MODULE_RWX)) {
+		set_memory_ro((unsigned long)page, 1);
+		set_memory_x((unsigned long)page, 1);
+	}
+	return page;
+}
+
 int arch_prepare_kprobe(struct kprobe *p)
 {
 	int ret = 0;
-- 
2.25.1


  parent reply	other threads:[~2021-05-06  2:40 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-06  2:34 [PATCH v12 0/8] powerpc: Further Strict RWX support Jordan Niethe
2021-05-06  2:34 ` [PATCH v12 1/8] powerpc/mm: Implement set_memory() routines Jordan Niethe
2021-05-06  2:34 ` [PATCH v12 2/8] powerpc/lib/code-patching: Set up Strict RWX patching earlier Jordan Niethe
2021-05-07  5:51   ` Christophe Leroy
2021-05-06  2:34 ` Jordan Niethe [this message]
2021-05-07  5:34   ` [PATCH v12 3/8] powerpc/kprobes: Mark newly allocated probes as ROX Christophe Leroy
2021-05-06  2:34 ` [PATCH v12 4/8] powerpc/bpf: Remove bpf_jit_free() Jordan Niethe
2021-05-07  5:51   ` Christophe Leroy
2021-05-06  2:34 ` [PATCH v12 5/8] powerpc/bpf: Write protect JIT code Jordan Niethe
2021-05-07  5:53   ` Christophe Leroy
2021-05-06  2:34 ` [PATCH v12 6/8] powerpc: Set ARCH_HAS_STRICT_MODULE_RWX Jordan Niethe
2021-05-07  5:35   ` Christophe Leroy
2021-05-10  0:52     ` Jordan Niethe
2021-05-06  2:34 ` [PATCH v12 7/8] powerpc/mm: implement set_memory_attr() Jordan Niethe
2021-05-06  2:34 ` [PATCH v12 8/8] 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=20210506023449.3568630-4-jniethe5@gmail.com \
    --to=jniethe5@gmail.com \
    --cc=ajd@linux.ibm.com \
    --cc=aneesh.kumar@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.