UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/fsl_booke/kaslr: support nokaslr cmdline parameter 

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>
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>
Signed-off-by: Scott Wood <oss@buserror.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Jason Yan 2019-09-20 17:45:43 +08:00 committed by Michael Ellerman
parent b396097200
commit 8c2ae87be5
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/powerpc/mm/nohash/kaslr_booke.c
View File

@ -281,6 +281,11 @@ static unsigned long __init kaslr_legal_offset(void *dt_ptr, unsigned long index
return koffset; return koffset;
} }
static inline __init bool kaslr_disabled(void)
{
return strstr(boot_command_line, "nokaslr") != NULL;
}
static unsigned long __init kaslr_choose_location(void *dt_ptr, phys_addr_t size, static unsigned long __init kaslr_choose_location(void *dt_ptr, phys_addr_t size,
unsigned long kernel_sz) unsigned long kernel_sz)
{ {
@ -290,6 +295,8 @@ static unsigned long __init kaslr_choose_location(void *dt_ptr, phys_addr_t size
unsigned long index; unsigned long index;
kaslr_get_cmdline(dt_ptr); kaslr_get_cmdline(dt_ptr);
if (kaslr_disabled())
return 0;
random = get_boot_seed(dt_ptr); random = get_boot_seed(dt_ptr);