|
Message-ID: <20200330022023.3691-6-yanaijie@huawei.com> Date: Mon, 30 Mar 2020 10:20:22 +0800 From: Jason Yan <yanaijie@...wei.com> To: <mpe@...erman.id.au>, <linuxppc-dev@...ts.ozlabs.org>, <diana.craciun@....com>, <christophe.leroy@....fr>, <benh@...nel.crashing.org>, <paulus@...ba.org>, <npiggin@...il.com>, <keescook@...omium.org>, <kernel-hardening@...ts.openwall.com>, <oss@...error.net> CC: <linux-kernel@...r.kernel.org>, <zhaohongjiang@...wei.com>, <dja@...ens.net>, Jason Yan <yanaijie@...wei.com> Subject: [PATCH v5 5/6] powerpc/fsl_booke/64: clear the original kernel if randomized The original kernel still exists in the memory, clear it now. Signed-off-by: Jason Yan <yanaijie@...wei.com> Cc: Scott Wood <oss@...error.net> Cc: Diana Craciun <diana.craciun@....com> Cc: Michael Ellerman <mpe@...erman.id.au> Cc: Christophe Leroy <christophe.leroy@....fr> Cc: Benjamin Herrenschmidt <benh@...nel.crashing.org> Cc: Paul Mackerras <paulus@...ba.org> Cc: Nicholas Piggin <npiggin@...il.com> Cc: Kees Cook <keescook@...omium.org> --- arch/powerpc/mm/nohash/kaslr_booke.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/mm/nohash/kaslr_booke.c b/arch/powerpc/mm/nohash/kaslr_booke.c index 24ad34641869..6c46f24cc53d 100644 --- a/arch/powerpc/mm/nohash/kaslr_booke.c +++ b/arch/powerpc/mm/nohash/kaslr_booke.c @@ -382,8 +382,10 @@ notrace void __init kaslr_early_init(void *dt_ptr, phys_addr_t size) unsigned long kernel_sz; if (IS_ENABLED(CONFIG_PPC64)) { - if (__run_at_load == 1) + if (__run_at_load == 1) { + kaslr_late_init(); return; + } /* Get the first memblock size */ early_get_first_memblock_info(dt_ptr, &size); -- 2.17.2
Powered by blists - more mailing lists
Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.