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 v4 09/10] powerpc/fsl_booke/kaslr: support nokaslr cmdline parameter
Date: Tue, 6 Aug 2019 09:59:26 +0200 [thread overview]
Message-ID: <e7703798-c2e2-c75f-1001-46c01db88238@c-s.fr> (raw)
In-Reply-To: <20190805064335.19156-10-yanaijie@huawei.com>
Le 05/08/2019 à 08:43, Jason Yan a écrit :
> 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>
> Reviewed-by: Diana Craciun <diana.craciun@nxp.com>
> Tested-by: Diana Craciun <diana.craciun@nxp.com>
Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr>
Tiny comment below.
> ---
> 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 4b3f19a663fc..7c3cb41e7122 100644
> --- a/arch/powerpc/kernel/kaslr_booke.c
> +++ b/arch/powerpc/kernel/kaslr_booke.c
> @@ -361,6 +361,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(boot_command_line, "nokaslr");
> + if ((str == boot_command_line) ||
> + (str > boot_command_line && *(str - 1) == ' '))
> + return true;
I don't think additional () are needed for the left part 'str ==
boot_command_line'
> +
> + return false;
> +}
> +
> /*
> * To see if we need to relocate the kernel to a random offset
> * void *dt_ptr - address of the device tree
> @@ -376,6 +388,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);
>
>
next prev parent reply other threads:[~2019-08-06 7:59 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-05 6:43 [PATCH v4 00/10] implement KASLR for powerpc/fsl_booke/32 Jason Yan
2019-08-05 6:43 ` [PATCH v4 01/10] powerpc: unify definition of M_IF_NEEDED Jason Yan
2019-08-05 6:43 ` [PATCH v4 02/10] powerpc: move memstart_addr and kernstart_addr to init-common.c Jason Yan
2019-08-05 6:43 ` [PATCH v4 03/10] powerpc: introduce kimage_vaddr to store the kernel base Jason Yan
2019-08-05 6:43 ` [PATCH v4 04/10] powerpc/fsl_booke/32: introduce create_tlb_entry() helper Jason Yan
2019-08-05 6:43 ` [PATCH v4 05/10] powerpc/fsl_booke/32: introduce reloc_kernel_entry() helper Jason Yan
2019-08-05 6:43 ` [PATCH v4 06/10] powerpc/fsl_booke/32: implement KASLR infrastructure Jason Yan
2019-08-06 7:52 ` Christophe Leroy
2019-08-05 6:43 ` [PATCH v4 07/10] powerpc/fsl_booke/32: randomize the kernel image offset Jason Yan
2019-08-06 7:56 ` Christophe Leroy
2019-08-07 3:16 ` Jason Yan
2019-08-05 6:43 ` [PATCH v4 08/10] powerpc/fsl_booke/kaslr: clear the original kernel if randomized Jason Yan
2019-08-05 6:43 ` [PATCH v4 09/10] powerpc/fsl_booke/kaslr: support nokaslr cmdline parameter Jason Yan
2019-08-06 7:59 ` Christophe Leroy [this message]
2019-08-07 3:22 ` Jason Yan
2019-08-05 6:43 ` [PATCH v4 10/10] powerpc/fsl_booke/kaslr: dump out kernel offset information on panic Jason Yan
2019-08-06 1:29 ` [PATCH v4 00/10] implement KASLR for powerpc/fsl_booke/32 Jason Yan
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=e7703798-c2e2-c75f-1001-46c01db88238@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).