Skip to contentSkip to conversation

arm64: consolidate rox page protection logic

PATCH Applied Russell King (Oracle) 2 participants 2 messages Jun 14, 2023 arm64

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: consolidate rox page protection logic

Consolidate the arm64 decision making for the page protections used for executable pages, used by both the trampoline code and the kernel text mapping code.

---
Mark Rutland said when giving the ack "It seems nice to ensure this is consistent, so regardless of whether we want the series as a whole ..."

So I'm sending this patch separately.

 arch/arm64/mm/mmu.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
arch/arm64/mm/mmu.c +7 -2
index af6bc8403ee4..4829abe017e9 100644
@@ -663,12 +663,17 @@ static void __init map_kernel_segment(pgd_t *pgdp, void *va_start, void *va_end,
 	vm_area_add_early(vma);
 }
 
+static pgprot_t kernel_exec_prot(void)
+{
+	return rodata_enabled ? PAGE_KERNEL_ROX : PAGE_KERNEL_EXEC;
+}
+
 #ifdef CONFIG_UNMAP_KERNEL_AT_EL0
 static int __init map_entry_trampoline(void)
 {
 	int i;
 
-	pgprot_t prot = rodata_enabled ? PAGE_KERNEL_ROX : PAGE_KERNEL_EXEC;
+	pgprot_t prot = kernel_exec_prot();
 	phys_addr_t pa_start = __pa_symbol(__entry_tramp_text_start);
 
 	/* The trampoline is always mapped and can therefore be global */
@@ -723,7 +728,7 @@ static void __init map_kernel(pgd_t *pgdp)
 	 * mapping to install SW breakpoints. Allow this (only) when
 	 * explicitly requested with rodata=off.
 	 */
-	pgprot_t text_prot = rodata_enabled ? PAGE_KERNEL_ROX : PAGE_KERNEL_EXEC;
+	pgprot_t text_prot = kernel_exec_prot();
 
 	/*
 	 * If we have a CPU that supports BTI and a kernel built for
Signature · 7 lines
2.30.2


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
maintainer Applied
#1 lore raw
Quoted 5 lines · Russell King (Oracle)

Consolidate the arm64 decision making for the page protections used for executable pages, used by both the trampoline code and the kernel text mapping code.

Applied to arm64 (for-next/misc), thanks!

[1/1] arm64: consolidate rox page protection logic

      https://git.kernel.org/arm64/c/601eaec513cc
Signature · 7 lines
Catalin


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel