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 09/10] powerpc/fsl_booke/kaslr: support nokaslr cmdline parameter Date: Wed, 17 Jul 2019 16:06:20 +0800 [thread overview] Message-ID: <20190717080621.40424-10-yanaijie@huawei.com> (raw) In-Reply-To: <20190717080621.40424-1-yanaijie@huawei.com> One may want to disable kaslr when boot, so provide a cmdline parameter 'nokaslr' to support this. 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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/powerpc/kernel/kaslr_booke.c b/arch/powerpc/kernel/kaslr_booke.c index 00339c05879f..e65a5d9d2ff1 100644 --- a/arch/powerpc/kernel/kaslr_booke.c +++ b/arch/powerpc/kernel/kaslr_booke.c @@ -373,6 +373,18 @@ static unsigned long __init kaslr_choose_location(void *dt_ptr, phys_addr_t size return kaslr_offset; } +static inline __init bool kaslr_disabled(void) +{ + char *str; + + str = strstr(early_command_line, "nokaslr"); + if ((str == early_command_line) || + (str > early_command_line && *(str - 1) == ' ')) + return true; + + return false; +} + /* * To see if we need to relocate the kernel to a random offset * void *dt_ptr - address of the device tree @@ -388,6 +400,8 @@ notrace void __init kaslr_early_init(void *dt_ptr, phys_addr_t size) kernel_sz = (unsigned long)_end - KERNELBASE; kaslr_get_cmdline(dt_ptr); + if (kaslr_disabled()) + return; offset = kaslr_choose_location(dt_ptr, size, kernel_sz); -- 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, thunder.leizhen@huawei.com, fanchengyang@huawei.com, yebin10@huawei.com Subject: [RFC PATCH 09/10] powerpc/fsl_booke/kaslr: support nokaslr cmdline parameter Date: Wed, 17 Jul 2019 16:06:20 +0800 [thread overview] Message-ID: <20190717080621.40424-10-yanaijie@huawei.com> (raw) In-Reply-To: <20190717080621.40424-1-yanaijie@huawei.com> One may want to disable kaslr when boot, so provide a cmdline parameter 'nokaslr' to support this. 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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/powerpc/kernel/kaslr_booke.c b/arch/powerpc/kernel/kaslr_booke.c index 00339c05879f..e65a5d9d2ff1 100644 --- a/arch/powerpc/kernel/kaslr_booke.c +++ b/arch/powerpc/kernel/kaslr_booke.c @@ -373,6 +373,18 @@ static unsigned long __init kaslr_choose_location(void *dt_ptr, phys_addr_t size return kaslr_offset; } +static inline __init bool kaslr_disabled(void) +{ + char *str; + + str = strstr(early_command_line, "nokaslr"); + if ((str == early_command_line) || + (str > early_command_line && *(str - 1) == ' ')) + return true; + + return false; +} + /* * To see if we need to relocate the kernel to a random offset * void *dt_ptr - address of the device tree @@ -388,6 +400,8 @@ notrace void __init kaslr_early_init(void *dt_ptr, phys_addr_t size) kernel_sz = (unsigned long)_end - KERNELBASE; kaslr_get_cmdline(dt_ptr); + if (kaslr_disabled()) + return; offset = kaslr_choose_location(dt_ptr, size, kernel_sz); -- 2.17.2
next prev parent reply other threads:[~2019-07-17 7:50 UTC|newest] Thread overview: 77+ 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 ` Jason Yan 2019-07-17 8:06 ` [RFC PATCH 01/10] powerpc: unify definition of M_IF_NEEDED Jason Yan 2019-07-17 8:06 ` Jason Yan 2019-07-29 10:59 ` Christophe Leroy 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-17 8:06 ` Jason Yan 2019-07-29 11:00 ` Christophe Leroy 2019-07-29 11:00 ` Christophe Leroy 2019-07-29 14:31 ` Christoph Hellwig 2019-07-29 14:31 ` Christoph Hellwig 2019-07-30 0:47 ` Jason Yan 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-17 8:06 ` Jason Yan 2019-07-29 11:00 ` Christophe Leroy 2019-07-29 11:00 ` Christophe Leroy 2019-07-29 14:32 ` Christoph Hellwig 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-17 8:06 ` Jason Yan 2019-07-29 11:05 ` Christophe Leroy 2019-07-29 11:05 ` Christophe Leroy 2019-07-29 13:26 ` Jason Yan 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-17 8:06 ` Jason Yan 2019-07-29 11:08 ` Christophe Leroy 2019-07-29 11:08 ` Christophe Leroy 2019-07-29 13:35 ` Jason Yan 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-17 8:06 ` Jason Yan 2019-07-29 11:16 ` Christophe Leroy 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-17 8:06 ` Jason Yan 2019-07-29 11:33 ` Christophe Leroy 2019-07-29 11:33 ` Christophe Leroy 2019-07-29 13:53 ` Jason Yan 2019-07-29 13:53 ` Jason Yan 2019-07-17 8:06 ` [RFC PATCH 08/10] powerpc/fsl_booke/kaslr: clear the original kernel if randomized Jason Yan 2019-07-17 8:06 ` Jason Yan 2019-07-29 11:19 ` Christophe Leroy 2019-07-29 11:19 ` Christophe Leroy 2019-07-29 13:43 ` Jason Yan 2019-07-29 13:43 ` Jason Yan 2019-07-17 8:06 ` Jason Yan [this message] 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 11:38 ` Christophe Leroy 2019-07-29 14:04 ` Jason Yan 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-17 8:06 ` Jason Yan 2019-07-29 11:43 ` Christophe Leroy 2019-07-29 11:43 ` Christophe Leroy 2019-07-29 14:08 ` Jason Yan 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 7:16 ` Jason Yan 2019-07-25 19:58 ` Kees Cook 2019-07-25 19:58 ` Kees Cook 2019-07-26 7:20 ` Jason Yan 2019-07-26 7:20 ` Jason Yan 2019-07-26 16:15 ` Kees Cook 2019-07-26 16:15 ` Kees Cook 2019-07-26 7:04 ` Diana Madalina Craciun 2019-07-26 7:04 ` Diana Madalina Craciun 2019-07-26 7:04 ` Diana Madalina Craciun 2019-07-26 7:26 ` Jason Yan 2019-07-26 7:26 ` Jason Yan 2019-07-26 7:26 ` Jason Yan 2019-07-29 14:30 ` Diana Madalina Craciun 2019-07-29 14:30 ` Diana Madalina Craciun 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-10-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: 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.