mm: ptdump: Refactor CONFIG_DEBUG_WX and check_wx_pages debugfs attribute
Subsystems (11)
v2 cover mm: ptdump: Refactor CONFIG_DEBUG_WX and check_wx_pages debugfs attribute
Refer old discussion at https://lore.kernel.org/lkml/20200422152656.GF676@willie-the-truck/T/#m802eaf33efd6f8d575939d157301b35ac0d4a64f
And https://github.com/KSPP/linux/issues/35
This series refactors CONFIG_DEBUG_WX for the 5 architectures implementing CONFIG_GENERIC_PTDUMP
First rename stuff in ARM which uses similar names while not implementing CONFIG_GENERIC_PTDUMP.
Then define a generic version of debug_checkwx() that calls ptdump_check_wx() when CONFIG_DEBUG_WX is set. Call it immediately after calling mark_rodata_ro() instead of calling it at the end of every mark_rodata_ro().
Then implement a debugfs attribute that can be used to trigger a W^X test at anytime and regardless of CONFIG_DEBUG_WX
Changes in v2:
- Fixed a few build failures (patch 1 and 2)
- Added patch 4
- Make the attribute return SUCCESS/FAILURE as suggested by Heiko (patch 5)
Christophe Leroy (5):
arm: ptdump: Rename CONFIG_DEBUG_WX to CONFIG_ARM_DEBUG_WX arm64, powerpc, riscv, s390, x86: ptdump: Refactor CONFIG_DEBUG_WX powerpc,s390: ptdump: Define ptdump_check_wx() regardless of
CONFIG_DEBUG_WX
mm: ptdump: Have ptdump_check_wx() return bool
mm: ptdump: add check_wx_pages debugfs attribute
arch/arm/Kconfig.debug | 2 +- arch/arm/configs/aspeed_g4_defconfig | 2 +- arch/arm/configs/aspeed_g5_defconfig | 2 +- arch/arm/include/asm/ptdump.h | 6 +++--- arch/arm/mm/init.c | 2 +- arch/arm64/include/asm/ptdump.h | 7 ------- arch/arm64/mm/mmu.c | 2 -- arch/arm64/mm/ptdump.c | 11 ++++++++--- arch/powerpc/mm/mmu_decl.h | 6 ------ arch/powerpc/mm/pgtable_32.c | 4 ---- arch/powerpc/mm/pgtable_64.c | 3 --- arch/powerpc/mm/ptdump/ptdump.c | 21 ++++++++++++++------- arch/riscv/include/asm/ptdump.h | 22 ---------------------- arch/riscv/mm/init.c | 3 --- arch/riscv/mm/ptdump.c | 12 ++++++++---- arch/s390/include/asm/ptdump.h | 14 -------------- arch/s390/mm/dump_pagetables.c | 21 +++++++++++---------- arch/s390/mm/init.c | 2 -- arch/x86/include/asm/pgtable.h | 5 ++--- arch/x86/mm/dump_pagetables.c | 20 ++++++++++++++------ arch/x86/mm/init_32.c | 2 -- arch/x86/mm/init_64.c | 2 -- include/linux/ptdump.h | 7 +++++++ init/main.c | 2 ++ mm/ptdump.c | 22 ++++++++++++++++++++++ 25 files changed, 95 insertions(+), 107 deletions(-) delete mode 100644 arch/riscv/include/asm/ptdump.h delete mode 100644 arch/s390/include/asm/ptdump.h
Signature · 1 line
2.43.0
PATCH v2 1/5 arm: ptdump: Rename CONFIG_DEBUG_WX to CONFIG_ARM_DEBUG_WX
CONFIG_DEBUG_WX is a core option defined in mm/Kconfig.debug
To avoid any future conflict, rename ARM version
into CONFIG_ARM_DEBUG_WX.
---
v2: Fixed left-over debug_checkwx() in mark_rodata_ro() and updated defconfigs
--- arch/arm/Kconfig.debug | 2 +- arch/arm/configs/aspeed_g4_defconfig | 2 +- arch/arm/configs/aspeed_g5_defconfig | 2 +- arch/arm/include/asm/ptdump.h | 6 +++--- arch/arm/mm/init.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/Kconfig.debug +1 -1
@@ -17,7 +17,7 @@ config ARM_PTDUMP_DEBUGFS kernel. If in doubt, say "N" -config DEBUG_WX +config ARM_DEBUG_WX bool "Warn on W+X mappings at boot" depends on MMU select ARM_PTDUMP_CORE
arch/arm/configs/aspeed_g4_defconfig +1 -1
@@ -252,7 +252,7 @@ CONFIG_DEBUG_INFO_REDUCED=y CONFIG_GDB_SCRIPTS=y CONFIG_STRIP_ASM_SYMS=y CONFIG_DEBUG_FS=y -CONFIG_DEBUG_WX=y +CONFIG_ARM_DEBUG_WX=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1
arch/arm/configs/aspeed_g5_defconfig +1 -1
@@ -302,7 +302,7 @@ CONFIG_DEBUG_INFO_REDUCED=y CONFIG_GDB_SCRIPTS=y CONFIG_STRIP_ASM_SYMS=y CONFIG_DEBUG_FS=y -CONFIG_DEBUG_WX=y +CONFIG_ARM_DEBUG_WX=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1
arch/arm/include/asm/ptdump.h +3 -3
@@ -32,10 +32,10 @@ void ptdump_check_wx(void);#endif /* CONFIG_ARM_PTDUMP_CORE */ -#ifdef CONFIG_DEBUG_WX -#define debug_checkwx () ptdump_check_wx() +#ifdef CONFIG_ARM_DEBUG_WX +#define arm_debug_checkwx () ptdump_check_wx()#else -#define debug_checkwx () do { } while (0) +#define arm_debug_checkwx () do { } while (0)#endif #endif /* __ASM_PTDUMP_H */
arch/arm/mm/init.c +1 -1
@@ -458,7 +458,7 @@ static int __mark_rodata_ro(void *unused)void mark_rodata_ro (void ) {stop_machine (__mark_rodata_ro,NULL ,NULL ); -debug_checkwx (); +arm_debug_checkwx (); }#else
Signature · 1 line
2.43.0
PATCH v2 2/5 arm64, powerpc, riscv, s390, x86: ptdump: Refactor CONFIG_DEBUG_WX
In reply to Christophe LeroyAll architectures using the core ptdump functionality also implement CONFIG_DEBUG_WX, and they all do it more or less the same way, with a function called debug_checkwx() that is called by mark_rodata_ro(), which is a substitute to ptdump_check_wx() when CONFIG_DEBUG_WX is set and a no-op otherwise.
Refactor by centraly defining debug_checkwx() in linux/ptdump.h and call debug_checkwx() immediately after calling mark_rodata_ro() instead of calling it at the end of every mark_rodata_ro().
On x86_32, mark_rodata_ro() first checks __supported_pte_mask has _PAGE_NX before calling debug_checkwx(). Now the check is inside the callee ptdump_walk_pgd_level_checkwx().
On powerpc_64, mark_rodata_ro() bails out early before calling ptdump_check_wx() when the MMU doesn't have KERNEL_RO feature. The check is now also done in ptdump_check_wx() as it is called outside mark_rodata_ro().
---
v2: For x86 change macro ptdump_check_wx() to ptdump_check_wx
--- arch/arm64/include/asm/ptdump.h | 7 ------- arch/arm64/mm/mmu.c | 2 -- arch/powerpc/mm/mmu_decl.h | 6 ------ arch/powerpc/mm/pgtable_32.c | 4 ---- arch/powerpc/mm/pgtable_64.c | 3 --- arch/powerpc/mm/ptdump/ptdump.c | 3 +++ arch/riscv/include/asm/ptdump.h | 22 ---------------------- arch/riscv/mm/init.c | 3 --- arch/riscv/mm/ptdump.c | 1 - arch/s390/include/asm/ptdump.h | 14 -------------- arch/s390/mm/dump_pagetables.c | 1 - arch/s390/mm/init.c | 2 -- arch/x86/include/asm/pgtable.h | 3 +-- arch/x86/mm/dump_pagetables.c | 3 +++ arch/x86/mm/init_32.c | 2 -- arch/x86/mm/init_64.c | 2 -- include/linux/ptdump.h | 7 +++++++ init/main.c | 2 ++ 18 files changed, 16 insertions(+), 71 deletions(-) delete mode 100644 arch/riscv/include/asm/ptdump.h delete mode 100644 arch/s390/include/asm/ptdump.h
arch/arm64/include/asm/ptdump.h +0 -7
@@ -29,13 +29,6 @@ void __init ptdump_debugfs_register(struct ptdump_info *info, const char *name);static inline void ptdump_debugfs_register (struct ptdump_info *info,const char *name) { }#endif -void ptdump_check_wx (void );#endif /* CONFIG_PTDUMP_CORE */ -#ifdef CONFIG_DEBUG_WX -#define debug_checkwx () ptdump_check_wx() -#else -#define debug_checkwx () do { } while (0) -#endif -#endif /* __ASM_PTDUMP_H */
arch/arm64/mm/mmu.c +0 -2
@@ -632,8 +632,6 @@ void mark_rodata_ro(void) section_size = (unsigned long )__init_begin - (unsigned long )__start_rodata;update_mapping_prot (__pa_symbol (__start_rodata), (unsigned long )__start_rodata, section_size,PAGE_KERNEL_RO ); - -debug_checkwx (); } static void __init map_kernel_segment(pgd_t *pgdp, void *va_start, void *va_end,
arch/powerpc/mm/mmu_decl.h +0 -6
@@ -171,12 +171,6 @@ static inline void mmu_mark_rodata_ro(void) { }void __init mmu_mapin_immr (void );#endif -#ifdef CONFIG_DEBUG_WX -void ptdump_check_wx (void ); -#else -static inline void ptdump_check_wx (void ) { } -#endif -static inline bool debug_pagealloc_enabled_or_kfence (void ) {return IS_ENABLED (CONFIG_KFENCE ) ||debug_pagealloc_enabled ();
arch/powerpc/mm/pgtable_32.c +0 -4
@@ -153,7 +153,6 @@ void mark_rodata_ro(void)if (v_block_mapped ((unsigned long )_stext +1 )) {mmu_mark_rodata_ro (); -ptdump_check_wx ();return ; }
@@ -166,9 +165,6 @@ void mark_rodata_ro(void)PFN_DOWN ((unsigned long )_stext); set_memory_ro((unsigned long)_stext, numpages); - -// mark_initmem_nx() should have already run by now - ptdump_check_wx(); }#endif
arch/powerpc/mm/pgtable_64.c +0 -3
@@ -150,9 +150,6 @@ void mark_rodata_ro(void)radix__mark_rodata_ro (); elsehash__mark_rodata_ro (); - -// mark_initmem_nx() should have already run by now -ptdump_check_wx (); }void mark_initmem_nx (void )
arch/powerpc/mm/ptdump/ptdump.c +3 -0
@@ -343,6 +343,9 @@ void ptdump_check_wx(void) } }; +if (IS_ENABLED (CONFIG_PPC_BOOK3S_64 ) && !mmu_has_feature (MMU_FTR_KERNEL_RO )) +return ; +ptdump_walk_pgd (&st.ptdump, &init_mm,NULL );if (st.wx_pages)
arch/riscv/include/asm/ptdump.h deleted +0 -22
@@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Copyright (C) 2019 SiFive -*/ - -#ifndef _ASM_RISCV_PTDUMP_H -#define _ASM_RISCV_PTDUMP_H - -void ptdump_check_wx (void ); - -#ifdef CONFIG_DEBUG_WX -static inline void debug_checkwx (void ) -{ -ptdump_check_wx (); -} -#else -static inline void debug_checkwx (void ) -{ -} -#endif - -#endif /* _ASM_RISCV_PTDUMP_H */
arch/riscv/mm/init.c +0 -3
@@ -29,7 +29,6 @@#include <asm/io.h> #include <asm/numa.h> #include <asm/pgtable.h> -#include <asm/ptdump.h> #include <asm/sections.h> #include <asm/soc.h> #include <asm/tlbflush.h>
@@ -723,8 +722,6 @@ void mark_rodata_ro(void)if (IS_ENABLED (CONFIG_64BIT ))set_kernel_memory (lm_alias (__start_rodata),lm_alias (_data), set_memory_ro); - - debug_checkwx(); }#else static __init pgprot_t pgprot_from_va (uintptr_t va)
arch/riscv/mm/ptdump.c +0 -1
@@ -9,7 +9,6 @@#include <linux/seq_file.h> #include <linux/ptdump.h> -#include <asm/ptdump.h> #include <linux/pgtable.h> #include <asm/kasan.h>
arch/s390/include/asm/ptdump.h deleted +0 -14
@@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ - -#ifndef _ASM_S390_PTDUMP_H -#define _ASM_S390_PTDUMP_H - -void ptdump_check_wx (void ); - -static inline void debug_checkwx (void ) -{ -if (IS_ENABLED (CONFIG_DEBUG_WX )) -ptdump_check_wx (); -} - -#endif /* _ASM_S390_PTDUMP_H */
arch/s390/mm/dump_pagetables.c +0 -1
@@ -6,7 +6,6 @@#include <linux/mm.h> #include <linux/kfence.h> #include <linux/kasan.h> -#include <asm/ptdump.h> #include <asm/kasan.h> #include <asm/abs_lowcore.h> #include <asm/nospec-branch.h>
arch/s390/mm/init.c +0 -2
@@ -37,7 +37,6 @@#include <asm/pgalloc.h> #include <asm/ctlreg.h> #include <asm/kfence.h> -#include <asm/ptdump.h> #include <asm/dma.h> #include <asm/abs_lowcore.h> #include <asm/tlb.h>
@@ -109,7 +108,6 @@ void mark_rodata_ro(void)__set_memory_ro (__start_ro_after_init, __end_ro_after_init);pr_info ("Write protected read-only-after-init data: %luk\n" , size >>10 ); -debug_checkwx (); }int set_memory_encrypted (unsigned long vaddr,int numpages)
arch/x86/include/asm/pgtable.h +1 -2
@@ -32,6 +32,7 @@ void ptdump_walk_pgd_level(struct seq_file *m, struct mm_struct *mm);void ptdump_walk_pgd_level_debugfs (struct seq_file *m,struct mm_struct *mm,bool user);void ptdump_walk_pgd_level_checkwx (void ); +#define ptdump_check_wx ptdump_walk_pgd_level_checkwxvoid ptdump_walk_user_pgd_level_checkwx (void );/*
@@ -41,10 +42,8 @@ void ptdump_walk_user_pgd_level_checkwx(void);#define pgprot_decrypted (prot) __pgprot(cc_mkdec(pgprot_val(prot)))#ifdef CONFIG_DEBUG_WX -#define debug_checkwx () ptdump_walk_pgd_level_checkwx()#define debug_checkwx_user () ptdump_walk_user_pgd_level_checkwx()#else -#define debug_checkwx () do { } while (0)#define debug_checkwx_user () do { } while (0)#endif
arch/x86/mm/dump_pagetables.c +3 -0
@@ -433,6 +433,9 @@ void ptdump_walk_user_pgd_level_checkwx(void)void ptdump_walk_pgd_level_checkwx (void ) { +if (!(__supported_pte_mask & _PAGE_NX)) +return ; +ptdump_walk_pgd_level_core (NULL , &init_mm,INIT_PGD , true, false); }
arch/x86/mm/init_32.c +0 -2
@@ -800,6 +800,4 @@ void mark_rodata_ro(void)set_pages_ro (virt_to_page (start), size >>PAGE_SHIFT );#endif mark_nxdata_nx (); -if (__supported_pte_mask & _PAGE_NX) -debug_checkwx (); }
arch/x86/mm/init_64.c +0 -2
@@ -1412,8 +1412,6 @@ void mark_rodata_ro(void) (void *)text_end, (void *)rodata_start);free_kernel_image_pages ("unused kernel image (rodata/data gap)" , (void *)rodata_end, (void *)_sdata); - -debug_checkwx (); }/*
include/linux/ptdump.h +7 -0
@@ -19,5 +19,12 @@ struct ptdump_state { };void ptdump_walk_pgd (struct ptdump_state *st,struct mm_struct *mm,pgd_t *pgd); +void ptdump_check_wx (void ); + +static inline void debug_checkwx (void ) +{ +if (IS_ENABLED (CONFIG_DEBUG_WX )) +ptdump_check_wx (); +}#endif /* _LINUX_PTDUMP_H */
init/main.c +2 -0
@@ -99,6 +99,7 @@#include <linux/init_syscalls.h> #include <linux/stackdepot.h> #include <linux/randomize_kstack.h> +#include <linux/ptdump.h> #include <net/net_namespace.h> #include <asm/io.h>
@@ -1408,6 +1409,7 @@ static void mark_readonly(void)*/ rcu_barrier ();mark_rodata_ro (); +debug_checkwx ();rodata_test (); }else pr_info ("Kernel memory protection disabled.\n" );
Signature · 1 line
2.43.0
PATCH v2 3/5 powerpc,s390: ptdump: Define ptdump_check_wx() regardless of CONFIG_DEBUG_WX
In reply to Christophe LeroyFollowing patch will use ptdump_check_wx() regardless of CONFIG_DEBUG_WX, so define it at all times on powerpc and s390 just like other architectures. Though keep the WARN_ON_ONCE() only when CONFIG_DEBUG_WX is set.
--- arch/powerpc/mm/ptdump/ptdump.c | 7 +++---- arch/s390/mm/dump_pagetables.c | 7 ++----- 2 files changed, 5 insertions(+), 9 deletions(-)
arch/powerpc/mm/ptdump/ptdump.c +3 -4
@@ -184,13 +184,14 @@ static void note_prot_wx(struct pg_state *st, unsigned long addr) {pte_t pte =__pte (st->current_flags); -if (!IS_ENABLED (CONFIG_DEBUG_WX ) || !st->check_wx) +if (!st->check_wx)return ;if (!pte_write (pte) || !pte_exec (pte))return ; -WARN_ONCE (1 ,"powerpc/mm: Found insecure W+X mapping at address %p/%pS\n" , +WARN_ONCE (IS_ENABLED (CONFIG_DEBUG_WX ), +"powerpc/mm: Found insecure W+X mapping at address %p/%pS\n" , (void *)st->start_address, (void *)st->start_address); st->wx_pages += (addr - st->start_address) /PAGE_SIZE ;
@@ -326,7 +327,6 @@ static void __init build_pgtable_complete_mask(void) pg_level[i].mask |= pg_level[i].flag[j].mask; } -#ifdef CONFIG_DEBUG_WXvoid ptdump_check_wx (void ) {struct pg_state st = {
@@ -354,7 +354,6 @@ void ptdump_check_wx(void)else pr_info ("Checked W+X mappings: passed, no W+X pages found\n" ); } -#endif static int __init ptdump_init (void ) {
arch/s390/mm/dump_pagetables.c +2 -5
@@ -121,7 +121,6 @@ static void print_prot(struct seq_file *m, unsigned int pr, int level)static void note_prot_wx (struct pg_state *st,unsigned long addr) { -#ifdef CONFIG_DEBUG_WX if (!st->check_wx)return ;if (st->current_prot & _PAGE_INVALID)
@@ -138,10 +137,10 @@ static void note_prot_wx(struct pg_state *st, unsigned long addr)*/ if (addr ==PAGE_SIZE && (nospec_uses_trampoline () || !static_key_enabled (&cpu_has_bear)))return ; -WARN_ONCE (1 ,"s390/mm: Found insecure W+X mapping at address %pS\n" , +WARN_ONCE (IS_ENABLED (CONFIG_DEBUG_WX ), +"s390/mm: Found insecure W+X mapping at address %pS\n" , (void *)st->start_address); st->wx_pages += (addr - st->start_address) /PAGE_SIZE ; -#endif /* CONFIG_DEBUG_WX */ }static void note_page (struct ptdump_state *pt_st,unsigned long addr,int level,u64 val)
@@ -193,7 +192,6 @@ static void note_page(struct ptdump_state *pt_st, unsigned long addr, int level, } } -#ifdef CONFIG_DEBUG_WXvoid ptdump_check_wx (void ) {struct pg_state st = {
@@ -226,7 +224,6 @@ void ptdump_check_wx(void) (nospec_uses_trampoline () || !static_key_enabled (&cpu_has_bear)) ? "unexpected " : ""); } -#endif /* CONFIG_DEBUG_WX */ #ifdef CONFIG_PTDUMP_DEBUGFS static int ptdump_show (struct seq_file *m,void *v)
Signature · 1 line
2.43.0
PATCH v2 4/5 mm: ptdump: Have ptdump_check_wx() return bool
In reply to Christophe LeroyHave ptdump_check_wx() return true when the check is successful or false otherwise.
---
v2: New
--- arch/arm64/mm/ptdump.c | 11 ++++++++--- arch/powerpc/mm/ptdump/ptdump.c | 13 +++++++++---- arch/riscv/mm/ptdump.c | 11 ++++++++--- arch/s390/mm/dump_pagetables.c | 13 +++++++++---- arch/x86/include/asm/pgtable.h | 2 +- arch/x86/mm/dump_pagetables.c | 19 ++++++++++++------- include/linux/ptdump.h | 2 +- 7 files changed, 48 insertions(+), 23 deletions(-)
arch/arm64/mm/ptdump.c +8 -3
@@ -345,7 +345,7 @@ static struct ptdump_info kernel_ptdump_info = { .base_addr = PAGE_OFFSET, }; -void ptdump_check_wx (void ) +bool ptdump_check_wx (void ) {struct pg_state st = { .seq =NULL ,
@@ -366,11 +366,16 @@ void ptdump_check_wx(void)ptdump_walk_pgd (&st.ptdump, &init_mm,NULL ); -if (st.wx_pages || st.uxn_pages) +if (st.wx_pages || st.uxn_pages) {pr_warn ("Checked W+X mappings: FAILED, %lu W+X pages found, %lu non-UXN pages found\n" , st.wx_pages, st.uxn_pages); -else + +return false; + }else {pr_info ("Checked W+X mappings: passed, no W+X pages found\n" ); + +return true; + } }static int __init ptdump_init (void )
arch/powerpc/mm/ptdump/ptdump.c +9 -4
@@ -327,7 +327,7 @@ static void __init build_pgtable_complete_mask(void) pg_level[i].mask |= pg_level[i].flag[j].mask; } -void ptdump_check_wx (void ) +bool ptdump_check_wx (void ) {struct pg_state st = { .seq =NULL ,
@@ -344,15 +344,20 @@ void ptdump_check_wx(void) };if (IS_ENABLED (CONFIG_PPC_BOOK3S_64 ) && !mmu_has_feature (MMU_FTR_KERNEL_RO )) -return ; +return true;ptdump_walk_pgd (&st.ptdump, &init_mm,NULL ); -if (st.wx_pages) +if (st.wx_pages) {pr_warn ("Checked W+X mappings: FAILED, %lu W+X pages found\n" , st.wx_pages); -else + +return false; + }else {pr_info ("Checked W+X mappings: passed, no W+X pages found\n" ); + +return true; + } }static int __init ptdump_init (void )
arch/riscv/mm/ptdump.c +8 -3
@@ -335,7 +335,7 @@ static void ptdump_walk(struct seq_file *s, struct ptd_mm_info *pinfo)ptdump_walk_pgd (&st.ptdump, pinfo->mm,NULL ); } -void ptdump_check_wx (void ) +bool ptdump_check_wx (void ) {struct pg_state st = { .seq =NULL ,
@@ -356,11 +356,16 @@ void ptdump_check_wx(void)ptdump_walk_pgd (&st.ptdump, &init_mm,NULL ); -if (st.wx_pages) +if (st.wx_pages) {pr_warn ("Checked W+X mappings: failed, %lu W+X pages found\n" , st.wx_pages); -else + +return false; + }else {pr_info ("Checked W+X mappings: passed, no W+X pages found\n" ); + +return true; + } }static int ptdump_show (struct seq_file *m,void *v)
arch/s390/mm/dump_pagetables.c +9 -4
@@ -192,7 +192,7 @@ static void note_page(struct ptdump_state *pt_st, unsigned long addr, int level, } } -void ptdump_check_wx (void ) +bool ptdump_check_wx (void ) {struct pg_state st = { .ptdump = {
@@ -215,14 +215,19 @@ void ptdump_check_wx(void) };if (!MACHINE_HAS_NX ) -return ; +return true;ptdump_walk_pgd (&st.ptdump, &init_mm,NULL ); -if (st.wx_pages) +if (st.wx_pages) {pr_warn ("Checked W+X mappings: FAILED, %lu W+X pages found\n" , st.wx_pages); -else + +return false; + }else {pr_info ("Checked W+X mappings: passed, no %sW+X pages found\n" , (nospec_uses_trampoline () || !static_key_enabled (&cpu_has_bear)) ?"unexpected " :"" ); + +return true; + } }#ifdef CONFIG_PTDUMP_DEBUGFS
arch/x86/include/asm/pgtable.h +1 -1
@@ -31,7 +31,7 @@ struct seq_file;void ptdump_walk_pgd_level (struct seq_file *m,struct mm_struct *mm);void ptdump_walk_pgd_level_debugfs (struct seq_file *m,struct mm_struct *mm,bool user); -void ptdump_walk_pgd_level_checkwx (void ); +bool ptdump_walk_pgd_level_checkwx (void );#define ptdump_check_wx ptdump_walk_pgd_level_checkwxvoid ptdump_walk_user_pgd_level_checkwx (void );
arch/x86/mm/dump_pagetables.c +12 -7
@@ -362,7 +362,7 @@ static void note_page(struct ptdump_state *pt_st, unsigned long addr, int level, } } -static void ptdump_walk_pgd_level_core (struct seq_file *m, +bool void ptdump_walk_pgd_level_core(struct seq_file *m,struct mm_struct *mm,pgd_t *pgd,bool checkwx,bool dmesg) {
@@ -391,12 +391,17 @@ static void ptdump_walk_pgd_level_core(struct seq_file *m,ptdump_walk_pgd (&st.ptdump, mm, pgd);if (!checkwx) -return ; -if (st.wx_pages) +return true; +if (st.wx_pages) {pr_info ("x86/mm: Checked W+X mappings: FAILED, %lu W+X pages found.\n" , st.wx_pages); -else + +return false; + }else {pr_info ("x86/mm: Checked W+X mappings: passed, no W+X pages found.\n" ); + +return true; + } }void ptdump_walk_pgd_level (struct seq_file *m,struct mm_struct *mm)
@@ -431,12 +436,12 @@ void ptdump_walk_user_pgd_level_checkwx(void)#endif } -void ptdump_walk_pgd_level_checkwx (void ) +bool ptdump_walk_pgd_level_checkwx (void ) {if (!(__supported_pte_mask & _PAGE_NX)) -return ; +return true; -ptdump_walk_pgd_level_core (NULL , &init_mm,INIT_PGD , true, false); +return ptdump_walk_pgd_level_core (NULL , &init_mm,INIT_PGD , true, false); }static int __init pt_dump_init (void )
include/linux/ptdump.h +1 -1
@@ -19,7 +19,7 @@ struct ptdump_state { };void ptdump_walk_pgd (struct ptdump_state *st,struct mm_struct *mm,pgd_t *pgd); -void ptdump_check_wx (void ); +bool ptdump_check_wx (void );static inline void debug_checkwx (void ) {
Signature · 1 line
2.43.0
PATCH v2 5/5 mm: ptdump: add check_wx_pages debugfs attribute
In reply to Christophe LeroyAdd a readable attribute in debugfs to trigger a
W^X pages check at any time.
To trigger the test, just read /sys/kernel/debug/check_wx_pages It will report FAILED if the test failed, SUCCESS otherwise.
Detailed result is provided into dmesg.
---
v2: Make it a read attribute which reports SUCCESS/FAILED instead of only relying on kernel message log.
--- mm/ptdump.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
mm/ptdump.c +22 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/pagewalk.h> +#include <linux/debugfs.h> #include <linux/ptdump.h> #include <linux/kasan.h>
@@ -163,3 +164,24 @@ void ptdump_walk_pgd(struct ptdump_state *st, struct mm_struct *mm, pgd_t *pgd)/* Flush out the last page */ st->note_page (st,0 ,-1 ,0 ); } + +static int check_wx_show (struct seq_file *m,void *v) +{ +if (ptdump_check_wx ()) +seq_puts (m,"SUCCESS\n" ); +else +seq_puts (m,"FAILED\n" ); + +return 0 ; +} + +DEFINE_SHOW_ATTRIBUTE (check_wx); + +static int ptdump_debugfs_init (void ) +{ +debugfs_create_file ("check_wx_pages" ,0400 ,NULL ,NULL , &check_wx_fops); + +return 0 ; +} + +device_initcall (ptdump_debugfs_init);
Signature · 1 line
2.43.0
kernel test robot
build botRe: [PATCH v2 4/5] mm: ptdump: Have ptdump_check_wx() return bool
In reply to Christophe Leroykernel test robot noticed the following build warnings:
Hi Christophe,
kernel test robot noticed the following build warnings:
[auto build test WARNING on akpm-mm/mm-everything]
url: https://github.com/intel-lab-lkp/linux/commits/Christophe-Leroy/arm-ptdump-Rename-CONFIG_DEBUG_WX-to-CONFIG_ARM_DEBUG_WX/20240130-183913 base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything patch link: https://lore.kernel.org/r/7943149fe955458cb7b57cd483bf41a3aad94684.1706610398.git.christophe.leroy%40csgroup.eu patch subject: [PATCH v2 4/5] mm: ptdump: Have ptdump_check_wx() return bool config: i386-randconfig-141-20240131 (https://download.01.org/0day-ci/archive/20240201/[email protected]/config) compiler: clang version 17.0.6 (https://github.com/llvm/llvm-project 6009708b4367171ccdbf4b5905cb6a803753fe18) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240201/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
arch/x86/mm/dump_pagetables.c:365:6: error: cannot combine with previous 'type-name' declaration specifier
365 | bool void ptdump_walk_pgd_level_core(struct seq_file *m,
| ^
>> arch/x86/mm/dump_pagetables.c:365:11: warning: no previous prototype for function 'ptdump_walk_pgd_level_core' [-Wmissing-prototypes]
365 | bool void ptdump_walk_pgd_level_core(struct seq_file *m,
| ^
arch/x86/mm/dump_pagetables.c:365:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
365 | bool void ptdump_walk_pgd_level_core(struct seq_file *m,
| ^
| static 1 warning and 1 error generated.
vim +/ptdump_walk_pgd_level_core +365 arch/x86/mm/dump_pagetables.c
364
> 365 bool void ptdump_walk_pgd_level_core(struct seq_file *m,
366 struct mm_struct *mm, pgd_t *pgd,
367 bool checkwx, bool dmesg)
368 {
369 const struct ptdump_range ptdump_ranges[] = {
370 #ifdef CONFIG_X86_64
371 {0, PTRS_PER_PGD * PGD_LEVEL_MULT / 2},
372 {GUARD_HOLE_END_ADDR, ~0UL},
373 #else
374 {0, ~0UL},
375 #endif
376 {0, 0}
377 };
378
379 struct pg_state st = {
380 .ptdump = {
381 .note_page = note_page,
382 .effective_prot = effective_prot,
383 .range = ptdump_ranges
384 },
385 .level = -1,
386 .to_dmesg = dmesg,
387 .check_wx = checkwx,
388 .seq = m
389 };
390
391 ptdump_walk_pgd(&st.ptdump, mm, pgd);
392
393 if (!checkwx)
394 return true;
395 if (st.wx_pages) {
396 pr_info("x86/mm: Checked W+X mappings: FAILED, %lu W+X pages found.\n",
397 st.wx_pages);
398
399 return false;
400 } else {
401 pr_info("x86/mm: Checked W+X mappings: passed, no W+X pages found.\n");
402
403 return true;
404 }
405 }
406
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botRe: [PATCH v2 4/5] mm: ptdump: Have ptdump_check_wx() return bool
In reply to Christophe Leroykernel test robot noticed the following build warnings:
Hi Christophe,
kernel test robot noticed the following build warnings:
[auto build test WARNING on akpm-mm/mm-everything]
url: https://github.com/intel-lab-lkp/linux/commits/Christophe-Leroy/arm-ptdump-Rename-CONFIG_DEBUG_WX-to-CONFIG_ARM_DEBUG_WX/20240130-183913 base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything patch link: https://lore.kernel.org/r/7943149fe955458cb7b57cd483bf41a3aad94684.1706610398.git.christophe.leroy%40csgroup.eu patch subject: [PATCH v2 4/5] mm: ptdump: Have ptdump_check_wx() return bool config: x86_64-defconfig (https://download.01.org/0day-ci/archive/20240201/[email protected]/config) compiler: gcc-11 (Debian 11.3.0-12) 11.3.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240201/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
arch/x86/mm/dump_pagetables.c:365:6: error: two or more data types in declaration specifiers
365 | bool void ptdump_walk_pgd_level_core(struct seq_file *m,
| ^~~~
>> arch/x86/mm/dump_pagetables.c:365:11: warning: no previous prototype for 'ptdump_walk_pgd_level_core' [-Wmissing-prototypes]
365 | bool void ptdump_walk_pgd_level_core(struct seq_file *m,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
vim +/ptdump_walk_pgd_level_core +365 arch/x86/mm/dump_pagetables.c
364
> 365 bool void ptdump_walk_pgd_level_core(struct seq_file *m,
366 struct mm_struct *mm, pgd_t *pgd,
367 bool checkwx, bool dmesg)
368 {
369 const struct ptdump_range ptdump_ranges[] = {
370 #ifdef CONFIG_X86_64
371 {0, PTRS_PER_PGD * PGD_LEVEL_MULT / 2},
372 {GUARD_HOLE_END_ADDR, ~0UL},
373 #else
374 {0, ~0UL},
375 #endif
376 {0, 0}
377 };
378
379 struct pg_state st = {
380 .ptdump = {
381 .note_page = note_page,
382 .effective_prot = effective_prot,
383 .range = ptdump_ranges
384 },
385 .level = -1,
386 .to_dmesg = dmesg,
387 .check_wx = checkwx,
388 .seq = m
389 };
390
391 ptdump_walk_pgd(&st.ptdump, mm, pgd);
392
393 if (!checkwx)
394 return true;
395 if (st.wx_pages) {
396 pr_info("x86/mm: Checked W+X mappings: FAILED, %lu W+X pages found.\n",
397 st.wx_pages);
398
399 return false;
400 } else {
401 pr_info("x86/mm: Checked W+X mappings: passed, no W+X pages found.\n");
402
403 return true;
404 }
405 }
406
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botRe: [PATCH v2 4/5] mm: ptdump: Have ptdump_check_wx() return bool
In reply to Christophe Leroykernel test robot noticed the following build errors:
Hi Christophe,
kernel test robot noticed the following build errors:
[auto build test ERROR on akpm-mm/mm-everything]
url: https://github.com/intel-lab-lkp/linux/commits/Christophe-Leroy/arm-ptdump-Rename-CONFIG_DEBUG_WX-to-CONFIG_ARM_DEBUG_WX/20240130-183913 base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything patch link: https://lore.kernel.org/r/7943149fe955458cb7b57cd483bf41a3aad94684.1706610398.git.christophe.leroy%40csgroup.eu patch subject: [PATCH v2 4/5] mm: ptdump: Have ptdump_check_wx() return bool config: x86_64-defconfig (https://download.01.org/0day-ci/archive/20240203/[email protected]/config) compiler: gcc-11 (Debian 11.3.0-12) 11.3.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240203/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> arch/x86/mm/dump_pagetables.c:365:6: error: two or more data types in declaration specifiers
365 | bool void ptdump_walk_pgd_level_core(struct seq_file *m,
| ^~~~
arch/x86/mm/dump_pagetables.c:365:11: warning: no previous prototype for 'ptdump_walk_pgd_level_core' [-Wmissing-prototypes]
365 | bool void ptdump_walk_pgd_level_core(struct seq_file *m,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
vim +365 arch/x86/mm/dump_pagetables.c
364
> 365 bool void ptdump_walk_pgd_level_core(struct seq_file *m,
366 struct mm_struct *mm, pgd_t *pgd,
367 bool checkwx, bool dmesg)
368 {
369 const struct ptdump_range ptdump_ranges[] = {
370 #ifdef CONFIG_X86_64
371 {0, PTRS_PER_PGD * PGD_LEVEL_MULT / 2},
372 {GUARD_HOLE_END_ADDR, ~0UL},
373 #else
374 {0, ~0UL},
375 #endif
376 {0, 0}
377 };
378
379 struct pg_state st = {
380 .ptdump = {
381 .note_page = note_page,
382 .effective_prot = effective_prot,
383 .range = ptdump_ranges
384 },
385 .level = -1,
386 .to_dmesg = dmesg,
387 .check_wx = checkwx,
388 .seq = m
389 };
390
391 ptdump_walk_pgd(&st.ptdump, mm, pgd);
392
393 if (!checkwx)
394 return true;
395 if (st.wx_pages) {
396 pr_info("x86/mm: Checked W+X mappings: FAILED, %lu W+X pages found.\n",
397 st.wx_pages);
398
399 return false;
400 } else {
401 pr_info("x86/mm: Checked W+X mappings: passed, no W+X pages found.\n");
402
403 return true;
404 }
405 }
406
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Re: [PATCH v2 2/5] arm64, powerpc, riscv, s390, x86: ptdump: Refactor CONFIG_DEBUG_WX
In reply to Christophe LeroyQuoted 348 lines · On Tue, 30 Jan 2024 02:34:33 PST (-0800), [email protected] wrote:
All architectures using the core ptdump functionality also implement
CONFIG_DEBUG_WX, and they all do it more or less the same way, with a function calleddebug_checkwx()that is called bymark_rodata_ro(), which is a substitute toptdump_check_wx()whenCONFIG_DEBUG_WXis set and a no-op otherwise.Refactor by centraly defining
debug_checkwx()inlinux/ptdump.hand calldebug_checkwx()immediately after callingmark_rodata_ro()instead of calling it at the end of everymark_rodata_ro().On
x86_32,mark_rodata_ro()first checks__supported_pte_maskhas_PAGE_NXbefore callingdebug_checkwx(). Now the check is inside the calleeptdump_walk_pgd_level_checkwx().On
powerpc_64,mark_rodata_ro()bails out early before callingptdump_check_wx()when the MMU doesn't haveKERNEL_ROfeature. The check is now also done inptdump_check_wx()as it is called outsidemark_rodata_ro().Signed-off-by Christophe Leroy <[email protected]>Reviewed-by Alexandre Ghiti <[email protected]>---
v2: For x86 change macroptdump_check_wx()toptdump_check_wx--- arch/arm64/include/asm/ptdump.h | 7 ------- arch/arm64/mm/mmu.c | 2 -- arch/powerpc/mm/mmu_decl.h | 6 ------ arch/powerpc/mm/pgtable_32.c | 4 ---- arch/powerpc/mm/pgtable_64.c | 3 --- arch/powerpc/mm/ptdump/ptdump.c | 3 +++ arch/riscv/include/asm/ptdump.h | 22 ---------------------- arch/riscv/mm/init.c | 3 --- arch/riscv/mm/ptdump.c | 1 - arch/s390/include/asm/ptdump.h | 14 -------------- arch/s390/mm/dump_pagetables.c | 1 - arch/s390/mm/init.c | 2 -- arch/x86/include/asm/pgtable.h | 3 +-- arch/x86/mm/dump_pagetables.c | 3 +++ arch/x86/mm/init_32.c | 2 -- arch/x86/mm/init_64.c | 2 -- include/linux/ptdump.h | 7 +++++++ init/main.c | 2 ++ 18 files changed, 16 insertions(+), 71 deletions(-) delete mode 100644 arch/riscv/include/asm/ptdump.h delete mode 100644 arch/s390/include/asm/ptdump.harch/arm64/include/asm/ptdump.h +0
-7@@ -29,13 +29,6 @@ void __init ptdump_debugfs_register(struct ptdump_info *info, const char *name);static inline void ptdump_debugfs_register (struct ptdump_info *info,const char *name) { }#endif -void ptdump_check_wx (void );#endif /* CONFIG_PTDUMP_CORE */ -#ifdef CONFIG_DEBUG_WX -#define debug_checkwx () ptdump_check_wx() -#else -#define debug_checkwx () do { } while (0) -#endif -#endif /* __ASM_PTDUMP_H */ arch/arm64/mm/mmu.c +0
-2@@ -632,8 +632,6 @@ void mark_rodata_ro(void) section_size = (unsigned long )__init_begin - (unsigned long )__start_rodata;update_mapping_prot (__pa_symbol (__start_rodata), (unsigned long )__start_rodata, section_size,PAGE_KERNEL_RO ); - -debug_checkwx (); } static void __init map_kernel_segment(pgd_t *pgdp, void *va_start, void *va_end,arch/powerpc/mm/mmu_decl.h +0
-6@@ -171,12 +171,6 @@ static inline void mmu_mark_rodata_ro(void) { }void __init mmu_mapin_immr (void );#endif -#ifdef CONFIG_DEBUG_WX -void ptdump_check_wx (void ); -#else -static inline void ptdump_check_wx (void ) { } -#endif -static inline bool debug_pagealloc_enabled_or_kfence (void ) {return IS_ENABLED (CONFIG_KFENCE ) ||debug_pagealloc_enabled ();arch/powerpc/mm/pgtable_32.c +0
-4@@ -153,7 +153,6 @@ void mark_rodata_ro(void)if (v_block_mapped ((unsigned long )_stext +1 )) {mmu_mark_rodata_ro (); -ptdump_check_wx ();return ; }@@ -166,9 +165,6 @@ void mark_rodata_ro(void)PFN_DOWN ((unsigned long )_stext); set_memory_ro((unsigned long)_stext, numpages); - -// mark_initmem_nx() should have already run by now - ptdump_check_wx(); }#endif arch/powerpc/mm/pgtable_64.c +0
-3@@ -150,9 +150,6 @@ void mark_rodata_ro(void)radix__mark_rodata_ro (); elsehash__mark_rodata_ro (); - -// mark_initmem_nx() should have already run by now -ptdump_check_wx (); }void mark_initmem_nx (void )arch/powerpc/mm/ptdump/ptdump.c +3
-0@@ -343,6 +343,9 @@ void ptdump_check_wx(void) } }; +if (IS_ENABLED (CONFIG_PPC_BOOK3S_64 ) && !mmu_has_feature (MMU_FTR_KERNEL_RO )) +return ; +ptdump_walk_pgd (&st.ptdump, &init_mm,NULL );if (st.wx_pages)arch/riscv/include/asm/ptdump.h deleted +0
-22@@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Copyright (C) 2019 SiFive -*/ - -#ifndef _ASM_RISCV_PTDUMP_H -#define _ASM_RISCV_PTDUMP_H - -void ptdump_check_wx (void ); - -#ifdef CONFIG_DEBUG_WX -static inline void debug_checkwx (void ) -{ -ptdump_check_wx (); -} -#else -static inline void debug_checkwx (void ) -{ -} -#endif - -#endif /* _ASM_RISCV_PTDUMP_H */ arch/riscv/mm/init.c +0
-3@@ -29,7 +29,6 @@#include <asm/io.h> #include <asm/numa.h> #include <asm/pgtable.h> -#include <asm/ptdump.h> #include <asm/sections.h> #include <asm/soc.h> #include <asm/tlbflush.h> @@ -723,8 +722,6 @@ void mark_rodata_ro(void)if (IS_ENABLED (CONFIG_64BIT ))set_kernel_memory (lm_alias (__start_rodata),lm_alias (_data), set_memory_ro); - - debug_checkwx(); }#else static __init pgprot_t pgprot_from_va (uintptr_t va)arch/riscv/mm/ptdump.c +0
-1@@ -9,7 +9,6 @@#include <linux/seq_file.h> #include <linux/ptdump.h> -#include <asm/ptdump.h> #include <linux/pgtable.h> #include <asm/kasan.h> arch/s390/include/asm/ptdump.h deleted +0
-14@@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ - -#ifndef _ASM_S390_PTDUMP_H -#define _ASM_S390_PTDUMP_H - -void ptdump_check_wx (void ); - -static inline void debug_checkwx (void ) -{ -if (IS_ENABLED (CONFIG_DEBUG_WX )) -ptdump_check_wx (); -} - -#endif /* _ASM_S390_PTDUMP_H */ arch/s390/mm/dump_pagetables.c +0
-1@@ -6,7 +6,6 @@#include <linux/mm.h> #include <linux/kfence.h> #include <linux/kasan.h> -#include <asm/ptdump.h> #include <asm/kasan.h> #include <asm/abs_lowcore.h> #include <asm/nospec-branch.h> arch/s390/mm/init.c +0
-2@@ -37,7 +37,6 @@#include <asm/pgalloc.h> #include <asm/ctlreg.h> #include <asm/kfence.h> -#include <asm/ptdump.h> #include <asm/dma.h> #include <asm/abs_lowcore.h> #include <asm/tlb.h> @@ -109,7 +108,6 @@ void mark_rodata_ro(void)__set_memory_ro (__start_ro_after_init, __end_ro_after_init);pr_info ("Write protected read-only-after-init data: %luk\n" , size >>10 ); -debug_checkwx (); }int set_memory_encrypted (unsigned long vaddr,int numpages)arch/x86/include/asm/pgtable.h +1
-2@@ -32,6 +32,7 @@ void ptdump_walk_pgd_level(struct seq_file *m, struct mm_struct *mm);void ptdump_walk_pgd_level_debugfs (struct seq_file *m,struct mm_struct *mm,bool user);void ptdump_walk_pgd_level_checkwx (void ); +#define ptdump_check_wx ptdump_walk_pgd_level_checkwxvoid ptdump_walk_user_pgd_level_checkwx (void );/* @@ -41,10 +42,8 @@ void ptdump_walk_user_pgd_level_checkwx(void);#define pgprot_decrypted (prot) __pgprot(cc_mkdec(pgprot_val(prot)))#ifdef CONFIG_DEBUG_WX -#define debug_checkwx () ptdump_walk_pgd_level_checkwx()#define debug_checkwx_user () ptdump_walk_user_pgd_level_checkwx()#else -#define debug_checkwx () do { } while (0)#define debug_checkwx_user () do { } while (0)#endif arch/x86/mm/dump_pagetables.c +3
-0@@ -433,6 +433,9 @@ void ptdump_walk_user_pgd_level_checkwx(void)void ptdump_walk_pgd_level_checkwx (void ) { +if (!(__supported_pte_mask & _PAGE_NX)) +return ; +ptdump_walk_pgd_level_core (NULL , &init_mm,INIT_PGD , true, false); }arch/x86/mm/init_32.c +0
-2@@ -800,6 +800,4 @@ void mark_rodata_ro(void)set_pages_ro (virt_to_page (start), size >>PAGE_SHIFT );#endif mark_nxdata_nx (); -if (__supported_pte_mask & _PAGE_NX) -debug_checkwx (); }arch/x86/mm/init_64.c +0
-2@@ -1412,8 +1412,6 @@ void mark_rodata_ro(void) (void *)text_end, (void *)rodata_start);free_kernel_image_pages ("unused kernel image (rodata/data gap)" , (void *)rodata_end, (void *)_sdata); - -debug_checkwx (); }/* include/linux/ptdump.h +7
-0@@ -19,5 +19,12 @@ struct ptdump_state { };void ptdump_walk_pgd (struct ptdump_state *st,struct mm_struct *mm,pgd_t *pgd); +void ptdump_check_wx (void ); + +static inline void debug_checkwx (void ) +{ +if (IS_ENABLED (CONFIG_DEBUG_WX )) +ptdump_check_wx (); +}#endif /* _LINUX_PTDUMP_H */ init/main.c +1
-0@@ -99,6 +99,7 @@#include <linux/init_syscalls.h> #include <linux/stackdepot.h> #include <linux/randomize_kstack.h> +#include <linux/ptdump.h> #include <net/net_namespace.h> #include <asm/io.h>
init/main.c static void mark_readonly(void) · line 1415
Quoted 7 lines
init/main.c +1
-0@@ -1408,6 +1409,7 @@ static void mark_readonly(void)*/ rcu_barrier ();mark_rodata_ro (); +debug_checkwx ();rodata_test (); }else pr_info ("Kernel memory protection disabled.\n" );