linuxppc-dev.lists.ozlabs.org archive mirror
 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 v14 3/9] powerpc/modules: Make module_alloc() Strict Module RWX aware
Date: Mon, 17 May 2021 13:28:04 +1000	[thread overview]
Message-ID: <20210517032810.129949-4-jniethe5@gmail.com> (raw)
In-Reply-To: <20210517032810.129949-1-jniethe5@gmail.com>

Make module_alloc() use PAGE_KERNEL protections instead of
PAGE_KERNEL_EXEX if Strict Module RWX is enabled.

Signed-off-by: Jordan Niethe <jniethe5@gmail.com>
---
v14: - Split out from powerpc: Set ARCH_HAS_STRICT_MODULE_RWX
     - Add and use strict_module_rwx_enabled() helper
---
 arch/powerpc/include/asm/mmu.h | 5 +++++
 arch/powerpc/kernel/module.c   | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index 607168b1aef4..7710bf0cbf8a 100644
--- a/arch/powerpc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
@@ -357,6 +357,11 @@ static inline bool strict_kernel_rwx_enabled(void)
 	return false;
 }
 #endif
+
+static inline bool strict_module_rwx_enabled(void)
+{
+	return IS_ENABLED(CONFIG_STRICT_MODULE_RWX) && strict_kernel_rwx_enabled();
+}
 #endif /* !__ASSEMBLY__ */
 
 /* The kernel use the constants below to index in the page sizes array.
diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c
index 3f35c8d20be7..ed04a3ba66fe 100644
--- a/arch/powerpc/kernel/module.c
+++ b/arch/powerpc/kernel/module.c
@@ -92,12 +92,14 @@ int module_finalize(const Elf_Ehdr *hdr,
 static __always_inline void *
 __module_alloc(unsigned long size, unsigned long start, unsigned long end)
 {
+	pgprot_t prot = strict_module_rwx_enabled() ? PAGE_KERNEL : PAGE_KERNEL_EXEC;
+
 	/*
 	 * Don't do huge page allocations for modules yet until more testing
 	 * is done. STRICT_MODULE_RWX may require extra work to support this
 	 * too.
 	 */
-	return __vmalloc_node_range(size, 1, start, end, GFP_KERNEL, PAGE_KERNEL_EXEC,
+	return __vmalloc_node_range(size, 1, start, end, GFP_KERNEL, prot,
 				    VM_FLUSH_RESET_PERMS | VM_NO_HUGE_VMAP,
 				    NUMA_NO_NODE, __builtin_return_address(0));
 }
-- 
2.25.1


  parent reply	other threads:[~2021-05-17  3:35 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-17  3:28 [PATCH v14 0/9] powerpc: Further Strict RWX support Jordan Niethe
2021-05-17  3:28 ` [PATCH v14 1/9] powerpc/mm: Implement set_memory() routines Jordan Niethe
2021-05-17  3:28 ` [PATCH v14 2/9] powerpc/lib/code-patching: Set up Strict RWX patching earlier Jordan Niethe
2021-05-17  3:28 ` Jordan Niethe [this message]
2021-05-17  6:36   ` [PATCH v14 3/9] powerpc/modules: Make module_alloc() Strict Module RWX aware Christophe Leroy
2021-05-17  6:48     ` Jordan Niethe
2021-05-17 11:01       ` Michael Ellerman
2021-05-17 11:05         ` Christophe Leroy
2021-05-18  1:43           ` Michael Ellerman
2021-05-17  3:28 ` [PATCH v14 4/9] powerpc/kprobes: Mark newly allocated probes as ROX Jordan Niethe
2021-05-17  3:28 ` [PATCH v14 5/9] powerpc/bpf: Remove bpf_jit_free() Jordan Niethe
2021-05-17  3:28 ` [PATCH v14 6/9] powerpc/bpf: Write protect JIT code Jordan Niethe
2021-05-17  6:39   ` Christophe Leroy
2021-05-20  4:02     ` Jordan Niethe
2021-05-17  3:28 ` [PATCH v14 7/9] powerpc: Set ARCH_HAS_STRICT_MODULE_RWX Jordan Niethe
2021-05-17  6:48   ` Christophe Leroy
2021-05-20  3:50     ` Jordan Niethe
2021-05-17  3:28 ` [PATCH v14 8/9] powerpc/mm: implement set_memory_attr() Jordan Niethe
2021-05-17  3:28 ` [PATCH v14 9/9] 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=20210517032810.129949-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 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).