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>, Jason Yan <yanaijie@huawei.com> Subject: [RFC PATCH 08/10] powerpc/fsl_booke/kaslr: clear the original kernel if randomized Date: Wed, 17 Jul 2019 16:06:19 +0800 Message-ID: <20190717080621.40424-9-yanaijie@huawei.com> (raw) In-Reply-To: <20190717080621.40424-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> --- 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 90357f4bd313..00339c05879f 100644 --- a/arch/powerpc/kernel/kaslr_booke.c +++ b/arch/powerpc/kernel/kaslr_booke.c @@ -412,3 +412,14 @@ notrace void __init kaslr_early_init(void *dt_ptr, phys_addr_t size) reloc_kernel_entry(dt_ptr, kimage_vaddr); } + +void __init kaslr_second_init(void) +{ + /* If randomized, clear the original kernel */ + if (kimage_vaddr != KERNELBASE) { + unsigned long kernel_sz; + + kernel_sz = (unsigned long)_end - kimage_vaddr; + memset((void *)KERNELBASE, 0, kernel_sz); + } +} diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h index 754ae1e69f92..9912ee598f9b 100644 --- a/arch/powerpc/mm/mmu_decl.h +++ b/arch/powerpc/mm/mmu_decl.h @@ -150,8 +150,10 @@ extern void loadcam_multi(int first_idx, int num, int tmp_idx); #ifdef CONFIG_RANDOMIZE_BASE extern void kaslr_early_init(void *dt_ptr, phys_addr_t size); +extern void kaslr_second_init(void); #else static inline void kaslr_early_init(void *dt_ptr, phys_addr_t size) {} +static inline void kaslr_second_init(void) {} #endif struct tlbcam { diff --git a/arch/powerpc/mm/nohash/fsl_booke.c b/arch/powerpc/mm/nohash/fsl_booke.c index 8d25a8dc965f..fa5a87f5c08e 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_second_init(); return; } -- 2.17.2
next prev parent reply index Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-17 8:06 [RFC PATCH 00/10] implement KASLR for powerpc/fsl_booke/32 Jason Yan 2019-07-17 8:06 ` [RFC PATCH 01/10] powerpc: unify definition of M_IF_NEEDED Jason Yan 2019-07-29 10:59 ` Christophe Leroy 2019-07-17 8:06 ` [RFC PATCH 02/10] powerpc: move memstart_addr and kernstart_addr to init-common.c Jason Yan 2019-07-29 11:00 ` Christophe Leroy 2019-07-29 14:31 ` Christoph Hellwig 2019-07-30 0:47 ` Jason Yan 2019-07-17 8:06 ` [RFC PATCH 03/10] powerpc: introduce kimage_vaddr to store the kernel base Jason Yan 2019-07-29 11:00 ` Christophe Leroy 2019-07-29 14:32 ` Christoph Hellwig 2019-07-17 8:06 ` [RFC PATCH 04/10] powerpc/fsl_booke/32: introduce create_tlb_entry() helper Jason Yan 2019-07-29 11:05 ` Christophe Leroy 2019-07-29 13:26 ` Jason Yan 2019-07-17 8:06 ` [RFC PATCH 05/10] powerpc/fsl_booke/32: introduce reloc_kernel_entry() helper Jason Yan 2019-07-29 11:08 ` Christophe Leroy 2019-07-29 13:35 ` Jason Yan 2019-07-17 8:06 ` [RFC PATCH 06/10] powerpc/fsl_booke/32: implement KASLR infrastructure Jason Yan 2019-07-29 11:16 ` Christophe Leroy 2019-07-17 8:06 ` [RFC PATCH 07/10] powerpc/fsl_booke/32: randomize the kernel image offset Jason Yan 2019-07-29 11:33 ` Christophe Leroy 2019-07-29 13:53 ` Jason Yan 2019-07-17 8:06 ` Jason Yan [this message] 2019-07-29 11:19 ` [RFC PATCH 08/10] powerpc/fsl_booke/kaslr: clear the original kernel if randomized Christophe Leroy 2019-07-29 13:43 ` Jason Yan 2019-07-17 8:06 ` [RFC PATCH 09/10] powerpc/fsl_booke/kaslr: support nokaslr cmdline parameter Jason Yan 2019-07-29 11:38 ` Christophe Leroy 2019-07-29 14:04 ` Jason Yan 2019-07-17 8:06 ` [RFC PATCH 10/10] powerpc/fsl_booke/kaslr: dump out kernel offset information on panic Jason Yan 2019-07-29 11:43 ` Christophe Leroy 2019-07-29 14:08 ` Jason Yan 2019-07-25 7:16 ` [RFC PATCH 00/10] implement KASLR for powerpc/fsl_booke/32 Jason Yan 2019-07-25 19:58 ` Kees Cook 2019-07-26 7:20 ` Jason Yan 2019-07-26 16:15 ` Kees Cook 2019-07-26 7:04 ` Diana Madalina Craciun 2019-07-26 7:26 ` Jason Yan 2019-07-29 14:30 ` Diana Madalina Craciun
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=20190717080621.40424-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 \ /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: link
Kernel-hardening Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/kernel-hardening/0 kernel-hardening/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 kernel-hardening kernel-hardening/ https://lore.kernel.org/kernel-hardening \ kernel-hardening@lists.openwall.com public-inbox-index kernel-hardening Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/com.openwall.lists.kernel-hardening AGPL code for this site: git clone https://public-inbox.org/public-inbox.git