riscv: Fix set_direct_map_default_noflush() to reset _PAGE_EXEC

Alexandre Ghiti · bjorn-rivos · commit 8947b7c413f9 · 2024-01-04T10:57:36.000+01:00
When resetting the linear mapping permissions, we must make sure that we clear the X bit so that do not end up with WX mappings (since we set PAGE_KERNEL). Fixes: 395a21f ("riscv: add ARCH_HAS_SET_DIRECT_MAP support") Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com> Signed-off-by: Björn Töpel <bjorn@rivosinc.com>
diff --git a/arch/riscv/mm/pageattr.c b/arch/riscv/mm/pageattr.c
@@ -378,7 +378,7 @@ int set_direct_map_invalid_noflush(struct page *page)
 int set_direct_map_default_noflush(struct page *page)
 {
 	return __set_memory((unsigned long)page_address(page), 1,
-			    PAGE_KERNEL, __pgprot(0));
+			    PAGE_KERNEL, __pgprot(_PAGE_EXEC));
 }
 
 #ifdef CONFIG_DEBUG_PAGEALLOC

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ int set_direct_map_invalid_noflush(struct page *page)`
`378`	`378`	`int set_direct_map_default_noflush(struct page *page)`
`379`	`379`	`{`
`380`	`380`	`return __set_memory((unsigned long)page_address(page), 1,`
`381`		`- PAGE_KERNEL, __pgprot(0));`
	`381`	`+ PAGE_KERNEL, __pgprot(_PAGE_EXEC));`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`#ifdef CONFIG_DEBUG_PAGEALLOC`