From: Jason Yan <yanaijie@huawei.com> To: <mpe@ellerman.id.au>, <linuxppc-dev@lists.ozlabs.org>, <diana.craciun@nxp.com>, <christophe.leroy@c-s.fr>, <benh@kernel.crashing.org>, <paulus@samba.org>, <npiggin@gmail.com>, <keescook@chromium.org>, <kernel-hardening@lists.openwall.com> Cc: <linux-kernel@vger.kernel.org>, <wangkefeng.wang@huawei.com>, <yebin10@huawei.com>, <thunder.leizhen@huawei.com>, <jingxiangfeng@huawei.com>, <fanchengyang@huawei.com>, <zhaohongjiang@huawei.com>, Jason Yan <yanaijie@huawei.com> Subject: [PATCH v6 08/12] powerpc/fsl_booke/kaslr: clear the original kernel if randomized Date: Fri, 9 Aug 2019 18:07:56 +0800 [thread overview] Message-ID: <20190809100800.5426-9-yanaijie@huawei.com> (raw) In-Reply-To: <20190809100800.5426-1-yanaijie@huawei.com> The original kernel still exists in the memory, clear it now. Signed-off-by: Jason Yan <yanaijie@huawei.com> Cc: Diana Craciun <diana.craciun@nxp.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Christophe Leroy <christophe.leroy@c-s.fr> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Kees Cook <keescook@chromium.org> Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr> Reviewed-by: Diana Craciun <diana.craciun@nxp.com> Tested-by: Diana Craciun <diana.craciun@nxp.com> --- arch/powerpc/kernel/kaslr_booke.c | 11 +++++++++++ arch/powerpc/mm/mmu_decl.h | 2 ++ arch/powerpc/mm/nohash/fsl_booke.c | 1 + 3 files changed, 14 insertions(+) diff --git a/arch/powerpc/kernel/kaslr_booke.c b/arch/powerpc/kernel/kaslr_booke.c index 51a0b3749724..9a360b6124ed 100644 --- a/arch/powerpc/kernel/kaslr_booke.c +++ b/arch/powerpc/kernel/kaslr_booke.c @@ -373,3 +373,14 @@ notrace void __init kaslr_early_init(void *dt_ptr, phys_addr_t size) reloc_kernel_entry(dt_ptr, kernstart_virt_addr); } + +void __init kaslr_late_init(void) +{ + /* If randomized, clear the original kernel */ + if (kernstart_virt_addr != KERNELBASE) { + unsigned long kernel_sz; + + kernel_sz = (unsigned long)_end - kernstart_virt_addr; + memzero_explicit((void *)KERNELBASE, kernel_sz); + } +} diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h index 213997d69729..64b2ac8a5343 100644 --- a/arch/powerpc/mm/mmu_decl.h +++ b/arch/powerpc/mm/mmu_decl.h @@ -151,8 +151,10 @@ extern void loadcam_multi(int first_idx, int num, int tmp_idx); #ifdef CONFIG_RANDOMIZE_BASE void kaslr_early_init(void *dt_ptr, phys_addr_t size); +void kaslr_late_init(void); #else static inline void kaslr_early_init(void *dt_ptr, phys_addr_t size) {} +static inline void kaslr_late_init(void) {} #endif struct tlbcam { diff --git a/arch/powerpc/mm/nohash/fsl_booke.c b/arch/powerpc/mm/nohash/fsl_booke.c index 2dc27cf88add..b4eb06ceb189 100644 --- a/arch/powerpc/mm/nohash/fsl_booke.c +++ b/arch/powerpc/mm/nohash/fsl_booke.c @@ -269,6 +269,7 @@ notrace void __init relocate_init(u64 dt_ptr, phys_addr_t start) kernstart_addr = start; if (is_second_reloc) { virt_phys_offset = PAGE_OFFSET - memstart_addr; + kaslr_late_init(); return; } -- 2.17.2
WARNING: multiple messages have this Message-ID (diff)
From: Jason Yan <yanaijie@huawei.com> To: <mpe@ellerman.id.au>, <linuxppc-dev@lists.ozlabs.org>, <diana.craciun@nxp.com>, <christophe.leroy@c-s.fr>, <benh@kernel.crashing.org>, <paulus@samba.org>, <npiggin@gmail.com>, <keescook@chromium.org>, <kernel-hardening@lists.openwall.com> Cc: wangkefeng.wang@huawei.com, Jason Yan <yanaijie@huawei.com>, linux-kernel@vger.kernel.org, jingxiangfeng@huawei.com, zhaohongjiang@huawei.com, thunder.leizhen@huawei.com, fanchengyang@huawei.com, yebin10@huawei.com Subject: [PATCH v6 08/12] powerpc/fsl_booke/kaslr: clear the original kernel if randomized Date: Fri, 9 Aug 2019 18:07:56 +0800 [thread overview] Message-ID: <20190809100800.5426-9-yanaijie@huawei.com> (raw) In-Reply-To: <20190809100800.5426-1-yanaijie@huawei.com> The original kernel still exists in the memory, clear it now. Signed-off-by: Jason Yan <yanaijie@huawei.com> Cc: Diana Craciun <diana.craciun@nxp.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Christophe Leroy <christophe.leroy@c-s.fr> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Kees Cook <keescook@chromium.org> Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr> Reviewed-by: Diana Craciun <diana.craciun@nxp.com> Tested-by: Diana Craciun <diana.craciun@nxp.com> --- arch/powerpc/kernel/kaslr_booke.c | 11 +++++++++++ arch/powerpc/mm/mmu_decl.h | 2 ++ arch/powerpc/mm/nohash/fsl_booke.c | 1 + 3 files changed, 14 insertions(+) diff --git a/arch/powerpc/kernel/kaslr_booke.c b/arch/powerpc/kernel/kaslr_booke.c index 51a0b3749724..9a360b6124ed 100644 --- a/arch/powerpc/kernel/kaslr_booke.c +++ b/arch/powerpc/kernel/kaslr_booke.c @@ -373,3 +373,14 @@ notrace void __init kaslr_early_init(void *dt_ptr, phys_addr_t size) reloc_kernel_entry(dt_ptr, kernstart_virt_addr); } + +void __init kaslr_late_init(void) +{ + /* If randomized, clear the original kernel */ + if (kernstart_virt_addr != KERNELBASE) { + unsigned long kernel_sz; + + kernel_sz = (unsigned long)_end - kernstart_virt_addr; + memzero_explicit((void *)KERNELBASE, kernel_sz); + } +} diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h index 213997d69729..64b2ac8a5343 100644 --- a/arch/powerpc/mm/mmu_decl.h +++ b/arch/powerpc/mm/mmu_decl.h @@ -151,8 +151,10 @@ extern void loadcam_multi(int first_idx, int num, int tmp_idx); #ifdef CONFIG_RANDOMIZE_BASE void kaslr_early_init(void *dt_ptr, phys_addr_t size); +void kaslr_late_init(void); #else static inline void kaslr_early_init(void *dt_ptr, phys_addr_t size) {} +static inline void kaslr_late_init(void) {} #endif struct tlbcam { diff --git a/arch/powerpc/mm/nohash/fsl_booke.c b/arch/powerpc/mm/nohash/fsl_booke.c index 2dc27cf88add..b4eb06ceb189 100644 --- a/arch/powerpc/mm/nohash/fsl_booke.c +++ b/arch/powerpc/mm/nohash/fsl_booke.c @@ -269,6 +269,7 @@ notrace void __init relocate_init(u64 dt_ptr, phys_addr_t start) kernstart_addr = start; if (is_second_reloc) { virt_phys_offset = PAGE_OFFSET - memstart_addr; + kaslr_late_init(); return; } -- 2.17.2
next prev parent reply other threads:[~2019-08-09 9:52 UTC|newest] Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-09 10:07 [PATCH v6 00/12] implement KASLR for powerpc/fsl_booke/32 Jason Yan 2019-08-09 10:07 ` Jason Yan 2019-08-09 10:07 ` [PATCH v6 01/12] powerpc: unify definition of M_IF_NEEDED Jason Yan 2019-08-09 10:07 ` Jason Yan 2019-08-09 10:07 ` [PATCH v6 02/12] powerpc: move memstart_addr and kernstart_addr to init-common.c Jason Yan 2019-08-09 10:07 ` Jason Yan 2019-08-09 10:07 ` [PATCH v6 03/12] powerpc: introduce kernstart_virt_addr to store the kernel base Jason Yan 2019-08-09 10:07 ` Jason Yan 2019-08-09 10:07 ` [PATCH v6 04/12] powerpc/fsl_booke/32: introduce create_tlb_entry() helper Jason Yan 2019-08-09 10:07 ` Jason Yan 2019-08-27 22:07 ` Scott Wood 2019-08-27 22:07 ` Scott Wood 2019-08-28 5:33 ` Jason Yan 2019-08-28 5:33 ` Jason Yan 2019-08-09 10:07 ` [PATCH v6 05/12] powerpc/fsl_booke/32: introduce reloc_kernel_entry() helper Jason Yan 2019-08-09 10:07 ` Jason Yan 2019-08-09 10:07 ` [PATCH v6 06/12] powerpc/fsl_booke/32: implement KASLR infrastructure Jason Yan 2019-08-09 10:07 ` Jason Yan 2019-08-28 4:54 ` Scott Wood 2019-08-28 4:54 ` Scott Wood 2019-08-28 5:47 ` Christophe Leroy 2019-08-28 5:47 ` Christophe Leroy 2019-08-29 6:26 ` Jason Yan 2019-08-29 6:26 ` Jason Yan 2019-08-28 11:03 ` Jason Yan 2019-08-28 11:03 ` Jason Yan 2019-08-28 16:44 ` Scott Wood 2019-08-28 16:44 ` Scott Wood 2019-08-28 16:44 ` Scott Wood 2019-08-09 10:07 ` [PATCH v6 07/12] powerpc/fsl_booke/32: randomize the kernel image offset Jason Yan 2019-08-09 10:07 ` Jason Yan 2019-08-09 10:07 ` Jason Yan [this message] 2019-08-09 10:07 ` [PATCH v6 08/12] powerpc/fsl_booke/kaslr: clear the original kernel if randomized Jason Yan 2019-08-09 10:07 ` [PATCH v6 09/12] powerpc/fsl_booke/kaslr: support nokaslr cmdline parameter Jason Yan 2019-08-09 10:07 ` Jason Yan 2019-08-09 10:07 ` [PATCH v6 10/12] powerpc/fsl_booke/kaslr: dump out kernel offset information on panic Jason Yan 2019-08-09 10:07 ` Jason Yan 2019-08-09 10:07 ` [PATCH v6 11/12] powerpc/fsl_booke/kaslr: export offset in VMCOREINFO ELF notes Jason Yan 2019-08-09 10:07 ` Jason Yan 2019-08-09 10:08 ` [PATCH v6 12/12] powerpc/fsl_booke/32: Document KASLR implementation Jason Yan 2019-08-09 10:08 ` Jason Yan 2019-08-19 6:12 ` [PATCH v6 00/12] implement KASLR for powerpc/fsl_booke/32 Jason Yan 2019-08-19 6:12 ` Jason Yan 2019-08-27 0:39 ` Jason Yan 2019-08-27 0:39 ` Jason Yan 2019-08-27 1:33 ` Michael Ellerman 2019-08-27 1:33 ` Michael Ellerman 2019-08-28 5:08 ` Scott Wood 2019-08-28 5:08 ` Scott Wood 2019-08-28 5:08 ` Scott Wood 2019-08-28 13:01 ` Michael Ellerman 2019-08-28 13:01 ` Michael Ellerman 2019-08-28 4:05 ` Scott Wood 2019-08-28 4:05 ` Scott Wood 2019-08-28 4:05 ` Scott Wood 2019-08-28 4:59 ` Scott Wood 2019-08-28 4:59 ` Scott Wood 2019-08-28 4:59 ` Scott Wood 2019-08-29 2:41 ` Jason Yan 2019-08-29 2:41 ` Jason Yan 2019-08-29 1:57 ` Jason Yan 2019-08-29 1:57 ` Jason Yan 2019-09-10 5:34 ` Jason Yan 2019-09-10 5:34 ` Jason Yan 2019-09-14 14:28 ` Scott Wood 2019-09-14 14:28 ` Scott Wood 2019-09-14 14:28 ` Scott Wood
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190809100800.5426-9-yanaijie@huawei.com \ --to=yanaijie@huawei.com \ --cc=benh@kernel.crashing.org \ --cc=christophe.leroy@c-s.fr \ --cc=diana.craciun@nxp.com \ --cc=fanchengyang@huawei.com \ --cc=jingxiangfeng@huawei.com \ --cc=keescook@chromium.org \ --cc=kernel-hardening@lists.openwall.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mpe@ellerman.id.au \ --cc=npiggin@gmail.com \ --cc=paulus@samba.org \ --cc=thunder.leizhen@huawei.com \ --cc=wangkefeng.wang@huawei.com \ --cc=yebin10@huawei.com \ --cc=zhaohongjiang@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.