riscv: improve self-protection
Subsystems (5)
v3 cover riscv: improve self-protection
From: Jisheng Zhang <[email protected]>
patch1 removes the non-necessary setup_zero_page()
patch2 is a trivial improvement patch to move some functions to .init section
Then following patches improve self-protection by:
Marking some variables __ro_after_init
Constifing some variables
Enabling ARCH_HAS_STRICT_MODULE_RWX
Hi Anup,
I kept the __init modification to trap_init(), I will cook a trivial series to provide a __weak but NULL trap_init() implementation in init/main.c then remove all NULL implementation from all arch.
Thanks
Since v2:
- collect Reviewed-by tag
- add one patch to remove unnecessary setup_zero_page()
Since v1:
- no need to move bpf_jit_alloc_exec() and bpf_jit_free_exec() to core because RV32 uses the default module_alloc() for jit code which also meets W^X after patch8
- fix a build error caused by local debug code clean up
Jisheng Zhang (10):
riscv: mm: Remove setup_zero_page()
riscv: add __init section marker to some functions
riscv: Mark some global variables __ro_after_init
riscv: Constify sys_call_table
riscv: Constify sbi_ipi_ops
riscv: kprobes: Implement alloc_insn_page()
riscv: bpf: Write protect JIT code
riscv: bpf: Avoid breaking W^X on RV64
riscv: module: Create module allocations without exec permissions
riscv: Set ARCH_HAS_STRICT_MODULE_RWX if MMU
arch/riscv/Kconfig | 1 + arch/riscv/include/asm/smp.h | 4 ++-- arch/riscv/include/asm/syscall.h | 2 +- arch/riscv/kernel/cpufeature.c | 2 +- arch/riscv/kernel/module.c | 10 ++++++++-- arch/riscv/kernel/probes/kprobes.c | 8 ++++++++ arch/riscv/kernel/sbi.c | 10 +++++----- arch/riscv/kernel/smp.c | 6 +++--- arch/riscv/kernel/syscall_table.c | 2 +- arch/riscv/kernel/time.c | 2 +- arch/riscv/kernel/traps.c | 2 +- arch/riscv/kernel/vdso.c | 4 ++-- arch/riscv/mm/init.c | 16 +++++----------- arch/riscv/mm/kasan_init.c | 6 +++--- arch/riscv/mm/ptdump.c | 2 +- arch/riscv/net/bpf_jit_comp64.c | 2 +- arch/riscv/net/bpf_jit_core.c | 1 + 17 files changed, 45 insertions(+), 35 deletions(-)
Signature · 1 line
2.31.0
PATCH v3 1/10 riscv: mm: Remove setup_zero_page()
From: Jisheng Zhang <[email protected]>
The empty_zero_page sits at .bss..page_aligned section, so will be cleared to zero during clearing bss, we don't need to clear it again.
--- arch/riscv/mm/init.c | 6 ------ 1 file changed, 6 deletions(-)
arch/riscv/mm/init.c +0 -6
@@ -57,11 +57,6 @@ static void __init zone_sizes_init(void)free_area_init (max_zone_pfns); } -static void setup_zero_page (void ) -{ -memset ((void *)empty_zero_page,0 ,PAGE_SIZE ); -} -#if defined(CONFIG_MMU ) && defined(CONFIG_DEBUG_VM )static inline void print_mlk (char *name,unsigned long b,unsigned long t) {
@@ -589,7 +584,6 @@ void mark_rodata_ro(void)void __init paging_init (void ) {setup_vm_final (); -setup_zero_page (); }void __init misc_mem_init (void )
Signature · 1 line
2.31.0
PATCH v3 2/10 riscv: add __init section marker to some functions
In reply to Jisheng ZhangFrom: Jisheng Zhang <[email protected]>
They are not needed after booting, so mark them as __init to move them to the __init section.
--- arch/riscv/kernel/cpufeature.c | 2 +- arch/riscv/kernel/traps.c | 2 +- arch/riscv/mm/init.c | 4 ++-- arch/riscv/mm/kasan_init.c | 6 +++--- arch/riscv/mm/ptdump.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)
arch/riscv/kernel/cpufeature.c +1 -1
@@ -59,7 +59,7 @@ bool __riscv_isa_extension_available(const unsigned long *isa_bitmap, int bit) }EXPORT_SYMBOL_GPL (__riscv_isa_extension_available); -void riscv_fill_hwcap (void ) +void __init riscv_fill_hwcap (void ) {struct device_node *node;const char *isa;
arch/riscv/kernel/traps.c +1 -1
@@ -196,6 +196,6 @@ int is_valid_bugaddr(unsigned long pc)#endif /* CONFIG_GENERIC_BUG */ /* stvec & scratch is already set from head.S */ -void trap_init (void ) +void __init trap_init (void ) { }
arch/riscv/mm/init.c +2 -2
@@ -70,7 +70,7 @@ static inline void print_mlm(char *name, unsigned long b, unsigned long t) (((t) - (b)) >> 20)); } -static void print_vm_layout (void ) +static void __init print_vm_layout (void ) {pr_notice ("Virtual kernel memory layout:\n" ); print_mlk("fixmap", (unsigned long)FIXADDR_START,
@@ -553,7 +553,7 @@ static inline void setup_vm_final(void)#endif /* CONFIG_MMU */ #ifdef CONFIG_STRICT_KERNEL_RWX -void protect_kernel_text_data (void ) +void __init protect_kernel_text_data (void ) {unsigned long text_start = (unsigned long )_start;unsigned long init_text_start = (unsigned long )__init_text_begin;
arch/riscv/mm/kasan_init.c +3 -3
@@ -48,7 +48,7 @@ asmlinkage void __init kasan_early_init(void)local_flush_tlb_all (); } -static void kasan_populate_pte (pmd_t *pmd,unsigned long vaddr,unsigned long end) +static void __init kasan_populate_pte (pmd_t *pmd,unsigned long vaddr,unsigned long end) {phys_addr_t phys_addr;pte_t *ptep, *base_pte;
@@ -70,7 +70,7 @@ static void kasan_populate_pte(pmd_t *pmd, unsigned long vaddr, unsigned long enset_pmd (pmd,pfn_pmd (PFN_DOWN (__pa (base_pte)),PAGE_TABLE )); } -static void kasan_populate_pmd (pgd_t *pgd,unsigned long vaddr,unsigned long end) +static void __init kasan_populate_pmd (pgd_t *pgd,unsigned long vaddr,unsigned long end) {phys_addr_t phys_addr;pmd_t *pmdp, *base_pmd;
@@ -105,7 +105,7 @@ static void kasan_populate_pmd(pgd_t *pgd, unsigned long vaddr, unsigned long enset_pgd (pgd,pfn_pgd (PFN_DOWN (__pa (base_pmd)),PAGE_TABLE )); } -static void kasan_populate_pgd (unsigned long vaddr,unsigned long end) +static void __init kasan_populate_pgd (unsigned long vaddr,unsigned long end) {phys_addr_t phys_addr;pgd_t *pgdp =pgd_offset_k (vaddr);
arch/riscv/mm/ptdump.c +1 -1
@@ -331,7 +331,7 @@ static int ptdump_show(struct seq_file *m, void *v)DEFINE_SHOW_ATTRIBUTE (ptdump); -static int ptdump_init (void ) +static int __init ptdump_init (void ) {unsigned int i, j;
Signature · 1 line
2.31.0
PATCH v3 3/10 riscv: Mark some global variables __ro_after_init
In reply to Jisheng ZhangFrom: Jisheng Zhang <[email protected]>
All of these are never modified after init, so they can be __ro_after_init.
--- arch/riscv/kernel/sbi.c | 8 ++++---- arch/riscv/kernel/smp.c | 4 ++-- arch/riscv/kernel/time.c | 2 +- arch/riscv/kernel/vdso.c | 4 ++-- arch/riscv/mm/init.c | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-)
arch/riscv/kernel/sbi.c +4 -4
@@ -11,14 +11,14 @@#include <asm/smp.h> /* default SBI version is 0.1 */ -unsigned long sbi_spec_version =SBI_SPEC_VERSION_DEFAULT ; +unsigned long sbi_spec_version__ro_after_init =SBI_SPEC_VERSION_DEFAULT ;EXPORT_SYMBOL (sbi_spec_version); -static void (*__sbi_set_timer)(uint64_t stime); -static int (*__sbi_send_ipi)(const unsigned long *hart_mask); +static void (*__sbi_set_timer)(uint64_t stime)__ro_after_init ; +static int (*__sbi_send_ipi)(const unsigned long *hart_mask)__ro_after_init ;static int (*__sbi_rfence)(int fid,const unsigned long *hart_mask,unsigned long start,unsigned long size, -unsigned long arg4,unsigned long arg5); +unsigned long arg4,unsigned long arg5)__ro_after_init ; struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0, unsigned long arg1, unsigned long arg2,
arch/riscv/kernel/smp.c +2 -2
@@ -32,7 +32,7 @@ enum ipi_message_type { IPI_MAX }; -unsigned long __cpuid_to_hartid_map[NR_CPUS ] = { +unsigned long __cpuid_to_hartid_map[NR_CPUS ]__ro_after_init = { [0 ...NR_CPUS -1 ] =INVALID_HARTID };
@@ -87,7 +87,7 @@ static void ipi_stop(void)wait_for_interrupt (); } -static struct riscv_ipi_ops *ipi_ops; +static struct riscv_ipi_ops *ipi_ops__ro_after_init ;void riscv_set_ipi_ops (struct riscv_ipi_ops *ops) {
arch/riscv/kernel/time.c +1 -1
@@ -11,7 +11,7 @@#include <asm/processor.h> #include <asm/timex.h> -unsigned long riscv_timebase; +unsigned long riscv_timebase__ro_after_init ;EXPORT_SYMBOL_GPL (riscv_timebase);void __init time_init (void )
arch/riscv/kernel/vdso.c +2 -2
@@ -20,8 +20,8 @@extern char vdso_start[], vdso_end[]; -static unsigned int vdso_pages; -static struct page **vdso_pagelist; +static unsigned int vdso_pages__ro_after_init ; +static struct page **vdso_pagelist__ro_after_init ;/* * The vDSO data page.
arch/riscv/mm/init.c +3 -3
@@ -145,11 +145,11 @@ void __init setup_bootmem(void) }#ifdef CONFIG_MMU -static struct pt_alloc_ops pt_ops; +static struct pt_alloc_ops pt_ops__ro_after_init ; -unsigned long va_pa_offset; +unsigned long va_pa_offset__ro_after_init ;EXPORT_SYMBOL (va_pa_offset); -unsigned long pfn_base; +unsigned long pfn_base__ro_after_init ;EXPORT_SYMBOL (pfn_base); pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
Signature · 1 line
2.31.0
PATCH v3 4/10 riscv: Constify sys_call_table
In reply to Jisheng ZhangFrom: Jisheng Zhang <[email protected]>
Constify the sys_call_table so that it will be placed in the .rodata section. This will cause attempts to modify the table to fail when strict page permissions are in place.
--- arch/riscv/include/asm/syscall.h | 2 +- arch/riscv/kernel/syscall_table.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/riscv/include/asm/syscall.h +1 -1
@@ -15,7 +15,7 @@#include <linux/err.h> /* The array of function pointers for syscalls. */ -extern void *sys_call_table[]; +extern void *const sys_call_table[];/* * Only the low 32 bits of orig_r0 are meaningful, so we return int.
arch/riscv/kernel/syscall_table.c +1 -1
@@ -13,7 +13,7 @@#undef __SYSCALL#define __SYSCALL (nr, call) [nr] = (call), -void *sys_call_table[__NR_syscalls] = { +void *const sys_call_table[__NR_syscalls] = { [0 ... __NR_syscalls -1 ] = sys_ni_syscall, #include <asm/unistd.h> };
Signature · 1 line
2.31.0
PATCH v3 5/10 riscv: Constify sbi_ipi_ops
In reply to Jisheng ZhangFrom: Jisheng Zhang <[email protected]>
Constify the sbi_ipi_ops so that it will be placed in the .rodata section. This will cause attempts to modify it to fail when strict page permissions are in place.
--- arch/riscv/include/asm/smp.h | 4 ++-- arch/riscv/kernel/sbi.c | 2 +- arch/riscv/kernel/smp.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/riscv/include/asm/smp.h +2 -2
@@ -46,7 +46,7 @@ int riscv_hartid_to_cpuid(int hartid);void riscv_cpuid_to_hartid_mask (const struct cpumask *in,struct cpumask *out);/* Set custom IPI operations */ -void riscv_set_ipi_ops (struct riscv_ipi_ops *ops); +void riscv_set_ipi_ops (const struct riscv_ipi_ops *ops);/* Clear IPI for current CPU */ void riscv_clear_ipi (void );
@@ -92,7 +92,7 @@ static inline void riscv_cpuid_to_hartid_mask(const struct cpumask *in,cpumask_set_cpu (boot_cpu_hartid, out); } -static inline void riscv_set_ipi_ops (struct riscv_ipi_ops *ops) +static inline void riscv_set_ipi_ops (const struct riscv_ipi_ops *ops) { }
arch/riscv/kernel/sbi.c +1 -1
@@ -571,7 +571,7 @@ static void sbi_send_cpumask_ipi(const struct cpumask *target)sbi_send_ipi (cpumask_bits (&hartid_mask)); } -static struct riscv_ipi_ops sbi_ipi_ops = { +static const struct riscv_ipi_ops sbi_ipi_ops = { .ipi_inject = sbi_send_cpumask_ipi };
arch/riscv/kernel/smp.c +2 -2
@@ -87,9 +87,9 @@ static void ipi_stop(void)wait_for_interrupt (); } -static struct riscv_ipi_ops *ipi_ops__ro_after_init ; +static const struct riscv_ipi_ops *ipi_ops__ro_after_init ; -void riscv_set_ipi_ops (struct riscv_ipi_ops *ops) +void riscv_set_ipi_ops (const struct riscv_ipi_ops *ops) { ipi_ops = ops; }
Signature · 8 lines
2.31.0 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v3 6/10 riscv: kprobes: Implement alloc_insn_page()
In reply to Jisheng ZhangFrom: Jisheng Zhang <[email protected]>
Allocate PAGE_KERNEL_READ_EXEC(read only, executable) page for kprobes insn page. This is to prepare for STRICT_MODULE_RWX.
--- arch/riscv/kernel/probes/kprobes.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/riscv/kernel/probes/kprobes.c +8 -0
@@ -84,6 +84,14 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)return 0 ; } +void *alloc_insn_page (void ) +{ +return __vmalloc_node_range (PAGE_SIZE ,1 ,VMALLOC_START ,VMALLOC_END , +GFP_KERNEL ,PAGE_KERNEL_READ_EXEC , +VM_FLUSH_RESET_PERMS ,NUMA_NO_NODE , +__builtin_return_address (0 )); +} +/* install breakpoint in text */ void __kprobes arch_arm_kprobe (struct kprobe *p) {
Signature · 8 lines
2.31.0 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v3 7/10 riscv: bpf: Write protect JIT code
In reply to Jisheng ZhangFrom: Jisheng Zhang <[email protected]>
Call bpf_jit_binary_lock_ro() to write protect JIT code.
--- arch/riscv/net/bpf_jit_core.c | 1 + 1 file changed, 1 insertion(+)
arch/riscv/net/bpf_jit_core.c +1 -0
@@ -152,6 +152,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)bpf_flush_icache (jit_data->header, ctx->insns + ctx->ninsns);if (!prog->is_func || extra_pass) { +bpf_jit_binary_lock_ro (jit_data->header); out_offset:kfree (ctx->offset);kfree (jit_data);
Signature · 8 lines
2.31.0 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v3 8/10 riscv: bpf: Avoid breaking W^X on RV64
In reply to Jisheng ZhangFrom: Jisheng Zhang <[email protected]>
bpf_jit_binary_lock_ro() in core not only set RO but also set EXEC permission when JIT is done, so no need to allocate RWX from the beginning, and it's not safe.
--- arch/riscv/net/bpf_jit_comp64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/net/bpf_jit_comp64.c +1 -1
@@ -1153,7 +1153,7 @@ void *bpf_jit_alloc_exec(unsigned long size) {return __vmalloc_node_range (size,PAGE_SIZE ,BPF_JIT_REGION_START ,BPF_JIT_REGION_END ,GFP_KERNEL , -PAGE_KERNEL_EXEC ,0 ,NUMA_NO_NODE , +PAGE_KERNEL ,0 ,NUMA_NO_NODE ,__builtin_return_address (0 )); }
Signature · 8 lines
2.31.0 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v3 9/10 riscv: module: Create module allocations without exec permissions
In reply to Jisheng ZhangFrom: Jisheng Zhang <[email protected]>
The core code manages the executable permissions of code regions of modules explicitly, it is not necessary to create the module vmalloc regions with RWX permissions. Create them with RW- permissions instead.
--- arch/riscv/kernel/module.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
arch/riscv/kernel/module.c +8 -2
@@ -407,14 +407,20 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,return 0 ; } -#if defined(CONFIG_MMU ) && defined(CONFIG_64BIT ) +#ifdef CONFIG_MMU + +#ifdef CONFIG_64BIT #define VMALLOC_MODULE_START \ max(PFN_ALIGN((unsigned long)&_end - SZ_2G), VMALLOC_START) +#else +#define VMALLOC_MODULE_START VMALLOC_START +#endif +void *module_alloc (unsigned long size) {return __vmalloc_node_range (size,1 ,VMALLOC_MODULE_START ,VMALLOC_END ,GFP_KERNEL , -PAGE_KERNEL_EXEC ,0 ,NUMA_NO_NODE , +PAGE_KERNEL ,0 ,NUMA_NO_NODE ,__builtin_return_address (0 )); }#endif
Signature · 8 lines
2.31.0 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v3 10/10 riscv: Set ARCH_HAS_STRICT_MODULE_RWX if MMU
In reply to Jisheng ZhangFrom: Jisheng Zhang <[email protected]>
Now we can set ARCH_HAS_STRICT_MODULE_RWX for MMU riscv platforms, this is good from security perspective.
--- arch/riscv/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/riscv/Kconfig +1 -0
@@ -29,6 +29,7 @@ config RISCV select ARCH_HAS_SET_DIRECT_MAP select ARCH_HAS_SET_MEMORY select ARCH_HAS_STRICT_KERNEL_RWX if MMU + select ARCH_HAS_STRICT_MODULE_RWX if MMU select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT
Signature · 8 lines
2.31.0 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v3 01/10] riscv: mm: Remove setup_zero_page()
In reply to Jisheng ZhangQuoted 7 lines · Jisheng Zhang
From: Jisheng Zhang <[email protected]>
The
empty_zero_pagesits at .bss..page_aligned section, so will be cleared to zero during clearing bss, we don't need to clear it again.Signed-off-by Jisheng Zhang <[email protected]>
Looks good to me.
Regards,
Anup
Quoted 32 lines
--- arch/riscv/mm/init.c | 6 ------ 1 file changed, 6 deletions(-)arch/riscv/mm/init.c +0
-7@@ -57,11 +57,6 @@ static void __init zone_sizes_init(void)free_area_init (max_zone_pfns); } -static void setup_zero_page (void ) -{ -memset ((void *)empty_zero_page,0 ,PAGE_SIZE ); -} -#if defined(CONFIG_MMU ) && defined(CONFIG_DEBUG_VM )static inline void print_mlk (char *name,unsigned long b,unsigned long t) {@@ -589,7 +584,6 @@ void mark_rodata_ro(void)void __init paging_init (void ) {setup_vm_final (); -setup_zero_page (); }void __init misc_mem_init (void ) --2.31.0
Re: [PATCH v3 02/10] riscv: add __init section marker to some functions
In reply to Jisheng ZhangQuoted 7 lines · Jisheng Zhang
From: Jisheng Zhang <[email protected]>
They are not needed after booting, so mark them as
__initto move them to the__initsection.Signed-off-by Jisheng Zhang <[email protected]>
Looks good to me.
Regards,
Anup
Quoted 103 lines
--- arch/riscv/kernel/cpufeature.c | 2 +- arch/riscv/kernel/traps.c | 2 +- arch/riscv/mm/init.c | 4 ++-- arch/riscv/mm/kasan_init.c | 6 +++--- arch/riscv/mm/ptdump.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)arch/riscv/kernel/cpufeature.c +1
-1@@ -59,7 +59,7 @@ bool __riscv_isa_extension_available(const unsigned long *isa_bitmap, int bit) }EXPORT_SYMBOL_GPL (__riscv_isa_extension_available); -void riscv_fill_hwcap (void ) +void __init riscv_fill_hwcap (void ) {struct device_node *node;const char *isa;arch/riscv/kernel/traps.c +1
-1@@ -196,6 +196,6 @@ int is_valid_bugaddr(unsigned long pc)#endif /* CONFIG_GENERIC_BUG */ /* stvec & scratch is already set from head.S */ -void trap_init (void ) +void __init trap_init (void ) { }arch/riscv/mm/init.c +2
-2@@ -70,7 +70,7 @@ static inline void print_mlm(char *name, unsigned long b, unsigned long t) (((t) - (b)) >> 20)); } -static void print_vm_layout (void ) +static void __init print_vm_layout (void ) {pr_notice ("Virtual kernel memory layout:\n" ); print_mlk("fixmap", (unsigned long)FIXADDR_START,@@ -553,7 +553,7 @@ static inline void setup_vm_final(void)#endif /* CONFIG_MMU */ #ifdef CONFIG_STRICT_KERNEL_RWX -void protect_kernel_text_data (void ) +void __init protect_kernel_text_data (void ) {unsigned long text_start = (unsigned long )_start;unsigned long init_text_start = (unsigned long )__init_text_begin;arch/riscv/mm/kasan_init.c +3
-3@@ -48,7 +48,7 @@ asmlinkage void __init kasan_early_init(void)local_flush_tlb_all (); } -static void kasan_populate_pte (pmd_t *pmd,unsigned long vaddr,unsigned long end) +static void __init kasan_populate_pte (pmd_t *pmd,unsigned long vaddr,unsigned long end) {phys_addr_t phys_addr;pte_t *ptep, *base_pte;@@ -70,7 +70,7 @@ static void kasan_populate_pte(pmd_t *pmd, unsigned long vaddr, unsigned long enset_pmd (pmd,pfn_pmd (PFN_DOWN (__pa (base_pte)),PAGE_TABLE )); } -static void kasan_populate_pmd (pgd_t *pgd,unsigned long vaddr,unsigned long end) +static void __init kasan_populate_pmd (pgd_t *pgd,unsigned long vaddr,unsigned long end) {phys_addr_t phys_addr;pmd_t *pmdp, *base_pmd;@@ -105,7 +105,7 @@ static void kasan_populate_pmd(pgd_t *pgd, unsigned long vaddr, unsigned long enset_pgd (pgd,pfn_pgd (PFN_DOWN (__pa (base_pmd)),PAGE_TABLE )); } -static void kasan_populate_pgd (unsigned long vaddr,unsigned long end) +static void __init kasan_populate_pgd (unsigned long vaddr,unsigned long end) {phys_addr_t phys_addr;pgd_t *pgdp =pgd_offset_k (vaddr);arch/riscv/mm/ptdump.c +1
-2@@ -331,7 +331,7 @@ static int ptdump_show(struct seq_file *m, void *v)DEFINE_SHOW_ATTRIBUTE (ptdump); -static int ptdump_init (void ) +static int __init ptdump_init (void ) {unsigned int i, j; --2.31.0
Quoted 13 lines · Jisheng Zhang
From: Jisheng Zhang <[email protected]>
patch1 removes the non-necessary
setup_zero_page()
patch2 is a trivial improvement patch to move some functions to .init sectionThen following patches improve self-protection by:
Marking some variables
__ro_after_init
Constifing some variables
EnablingARCH_HAS_STRICT_MODULE_RWX
Quoted 5 lines
Hi Anup,
I kept the
__initmodification totrap_init(), I will cook a trivial series to provide a__weakbut NULLtrap_init()implementation ininit/main.cthen remove all NULL implementation from all arch.
Yes, it makes sense to do this as a separate series.
Regards,
Anup
Quoted 49 lines
Thanks
Since v2:
- collect Reviewed-by tag
- add one patch to remove unnecessarysetup_zero_page()Since v1:
- no need to movebpf_jit_alloc_exec()andbpf_jit_free_exec()to core because RV32 uses the defaultmodule_alloc()for jit code which also meets W^X after patch8
- fix a build error caused by local debug code clean upJisheng Zhang (10):
riscv: mm: Removesetup_zero_page()
riscv: add__initsection marker to some functions
riscv: Mark some global variables__ro_after_init
riscv: Constifysys_call_table
riscv: Constifysbi_ipi_ops
riscv: kprobes: Implementalloc_insn_page()
riscv: bpf: Write protect JIT code
riscv: bpf: Avoid breaking W^X on RV64
riscv: module: Create module allocations without exec permissions
riscv: SetARCH_HAS_STRICT_MODULE_RWXif MMUarch/riscv/Kconfig | 1 + arch/riscv/include/asm/smp.h | 4 ++-- arch/riscv/include/asm/syscall.h | 2 +- arch/riscv/kernel/cpufeature.c | 2 +- arch/riscv/kernel/module.c | 10 ++++++++-- arch/riscv/kernel/probes/kprobes.c | 8 ++++++++ arch/riscv/kernel/sbi.c | 10 +++++----- arch/riscv/kernel/smp.c | 6 +++--- arch/riscv/kernel/syscall_table.c | 2 +- arch/riscv/kernel/time.c | 2 +- arch/riscv/kernel/traps.c | 2 +- arch/riscv/kernel/vdso.c | 4 ++-- arch/riscv/mm/init.c | 16 +++++----------- arch/riscv/mm/kasan_init.c | 6 +++--- arch/riscv/mm/ptdump.c | 2 +- arch/riscv/net/bpf_jit_comp64.c | 2 +- arch/riscv/net/bpf_jit_core.c | 1 + 17 files changed, 45 insertions(+), 35 deletions(-)--
2.31.0