From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Jason Yan <yanaijie@huawei.com>,
mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org,
diana.craciun@nxp.com, 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
Subject: Re: [PATCH v2 08/10] powerpc/fsl_booke/kaslr: clear the original kernel if randomized
Date: Tue, 30 Jul 2019 11:47:34 +0200 [thread overview]
Message-ID: <fc1bf072-8256-f944-cc60-f0da50d319ff@c-s.fr> (raw)
In-Reply-To: <20190730074225.39544-9-yanaijie@huawei.com>
Le 30/07/2019 à 09:42, Jason Yan a écrit :
> 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>
Is kaslr_second_init() the best name ?
What about kaslr_late_init() or kaslr_clear_early_kernel() or ... ?
Christophe
> ---
> 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 0bb02e45b928..f032ac119457 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;
> + memzero_explicit((void *)KERNELBASE, kernel_sz);
> + }
> +}
> diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h
> index 9332772c8a66..550c8d742f88 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
> void kaslr_early_init(void *dt_ptr, phys_addr_t size);
> +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;
> }
>
>
next prev parent reply other threads:[~2019-07-30 9:47 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-30 7:42 [PATCH v2 00/10] implement KASLR for powerpc/fsl_booke/32 Jason Yan
2019-07-30 7:42 ` [PATCH v2 01/10] powerpc: unify definition of M_IF_NEEDED Jason Yan
2019-07-30 7:42 ` [PATCH v2 02/10] powerpc: move memstart_addr and kernstart_addr to init-common.c Jason Yan
2019-07-30 9:25 ` Christophe Leroy
2019-07-30 7:42 ` [PATCH v2 03/10] powerpc: introduce kimage_vaddr to store the kernel base Jason Yan
2019-07-30 9:25 ` Christophe Leroy
2019-07-30 7:42 ` [PATCH v2 04/10] powerpc/fsl_booke/32: introduce create_tlb_entry() helper Jason Yan
2019-07-30 9:26 ` Christophe Leroy
2019-07-30 7:42 ` [PATCH v2 05/10] powerpc/fsl_booke/32: introduce reloc_kernel_entry() helper Jason Yan
2019-07-30 9:26 ` Christophe Leroy
2019-07-30 7:42 ` [PATCH v2 06/10] powerpc/fsl_booke/32: implement KASLR infrastructure Jason Yan
2019-07-30 9:34 ` Christophe Leroy
2019-07-31 2:03 ` Jason Yan
2019-07-30 7:42 ` [PATCH v2 07/10] powerpc/fsl_booke/32: randomize the kernel image offset Jason Yan
2019-07-30 9:44 ` Christophe Leroy
2019-07-31 2:06 ` Jason Yan
2019-07-30 7:42 ` [PATCH v2 08/10] powerpc/fsl_booke/kaslr: clear the original kernel if randomized Jason Yan
2019-07-30 9:47 ` Christophe Leroy [this message]
2019-07-30 7:42 ` [PATCH v2 09/10] powerpc/fsl_booke/kaslr: support nokaslr cmdline parameter Jason Yan
2019-07-30 7:42 ` [PATCH v2 10/10] powerpc/fsl_booke/kaslr: dump out kernel offset information on panic Jason Yan
2019-07-30 9:48 ` Christophe Leroy
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=fc1bf072-8256-f944-cc60-f0da50d319ff@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=benh@kernel.crashing.org \
--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=yanaijie@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).