lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 5 Jan 2022 11:07:55 +0800 From: AliOS system security <alios_sys_security@...ux.alibaba.com> To: catalin.marinas@....com, will@...nel.org Cc: linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org, AliOS system security <alios_sys_security@...ux.alibaba.com> Subject: [PATCH] arm64: fix build error when use rodata_enabled rodata_enabled should be used when CONFIG_STRICT_KERNEL_RWX or CONFIG_STRICT_MODULE_RWX is selected Signed-off-by: AliOS system security <alios_sys_security@...ux.alibaba.com> --- arch/arm64/mm/mmu.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index acfae9b..47f8754 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -596,6 +596,7 @@ static void __init map_kernel_segment(pgd_t *pgdp, void *va_start, void *va_end, vm_area_add_early(vma); } +#if defined(CONFIG_STRICT_KERNEL_RWX) || defined(CONFIG_STRICT_MODULE_RWX) static int __init parse_rodata(char *arg) { int ret = strtobool(arg, &rodata_enabled); @@ -613,11 +614,16 @@ static int __init parse_rodata(char *arg) return 0; } early_param("rodata", parse_rodata); +#endif #ifdef CONFIG_UNMAP_KERNEL_AT_EL0 static int __init map_entry_trampoline(void) { - pgprot_t prot = rodata_enabled ? PAGE_KERNEL_ROX : PAGE_KERNEL_EXEC; + pgprot_t prot = PAGE_KERNEL_EXEC; +#if defined(CONFIG_STRICT_KERNEL_RWX) || defined(CONFIG_STRICT_MODULE_RWX) + if (rodata_enabled) + prot = PAGE_KERNEL_ROX; +#endif phys_addr_t pa_start = __pa_symbol(__entry_tramp_text_start); /* The trampoline is always mapped and can therefore be global */ @@ -672,7 +678,11 @@ 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 = PAGE_KERNEL_EXEC; +#if defined(CONFIG_STRICT_KERNEL_RWX) || defined(CONFIG_STRICT_MODULE_RWX) + if (rodata_enabled) + text_prot = PAGE_KERNEL_ROX; +#endif /* * If we have a CPU that supports BTI and a kernel built for -- 2.7.4
Powered by blists - more mailing lists