leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/fsl_booke/kaslr: clear the original kernel if randomized

Browse Source 
The original kernel still exists in the memory, clear it now.

Signed-off-by: Jason Yan <yanaijie@huawei.com>
Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr>
Reviewed-by: Diana Craciun <diana.craciun@nxp.com>
Tested-by: Diana Craciun <diana.craciun@nxp.com>
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:42 +08:00
committed by Michael Ellerman
parent 6a38ea1d7b
commit b396097200
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/mm/mmu_decl.h
View File

@@ -148,8 +148,10 @@ extern void loadcam_multi(int first_idx, int num, int tmp_idx);
#ifdef CONFIG_RANDOMIZE_BASE #ifdef CONFIG_RANDOMIZE_BASE
void kaslr_early_init(void *dt_ptr, phys_addr_t size); void kaslr_early_init(void *dt_ptr, phys_addr_t size);
void kaslr_late_init(void);
#else #else
static inline void kaslr_early_init(void *dt_ptr, phys_addr_t size) {} static inline void kaslr_early_init(void *dt_ptr, phys_addr_t size) {}
static inline void kaslr_late_init(void) {}
#endif #endif
struct tlbcam { struct tlbcam {

1
arch/powerpc/mm/nohash/fsl_booke.c
View File

@@ -269,6 +269,7 @@ notrace void __init relocate_init(u64 dt_ptr, phys_addr_t start)
kernstart_addr = start; kernstart_addr = start;
if (is_second_reloc) { if (is_second_reloc) {
virt_phys_offset = PAGE_OFFSET - memstart_addr; virt_phys_offset = PAGE_OFFSET - memstart_addr;
kaslr_late_init();
return; return;
} }

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

@@ -381,3 +381,14 @@ notrace void __init kaslr_early_init(void *dt_ptr, phys_addr_t size)
reloc_kernel_entry(dt_ptr, kernstart_virt_addr); reloc_kernel_entry(dt_ptr, kernstart_virt_addr);
} }
void __init kaslr_late_init(void)
{
/* If randomized, clear the original kernel */
if (kernstart_virt_addr != KERNELBASE) {
unsigned long kernel_sz;
kernel_sz = (unsigned long)_end - kernstart_virt_addr;
memzero_explicit((void *)KERNELBASE, kernel_sz);
}
}