Commit 05bfa534 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Zheng Zengkai
Browse files

ARM: mm: export default vmalloc base address 

maillist inclusion
commit c3ae0029ea41f4a26a40f592062155412d1b6d07
category: feature
feature: ARM kaslr support
bugzilla: 47952
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/ardb/linux.git/commit/?h=arm-kaslr-latest&id=c3ae0029ea41f4a26a40f592062155412d1b6d07



-------------------------------------------------

In order for the EFI stub to be able to decide over what range to
randomize the load address of the kernel, expose the definition of
the default vmalloc base address as VMALLOC_DEFAULT_BASE.

Cc: Russell King <linux@armlinux.org.uk>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarCui GaoSheng <cuigaosheng1@huawei.com>
Reviewed-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 352f1bcc

arch/arm/include/asm/pgtable.h

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#define VMALLOC_OFFSET		(8*1024*1024)

#define VMALLOC_START		(((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))

#define VMALLOC_END		0xff800000UL

#define VMALLOC_DEFAULT_BASE	(VMALLOC_END - (240 << 20) - VMALLOC_OFFSET)



#define LIBRARY_TEXT_START	0x0c000000

arch/arm/mm/mmu.c

+1 −2
Original line number Diff line number Diff line
@@ -1148,8 +1148,7 @@ void __init debug_ll_io_init(void) 
}

#endif



static void * __initdata vmalloc_min =

	(void *)(VMALLOC_END - (240 << 20) - VMALLOC_OFFSET);

static void * __initdata vmalloc_min = (void *)VMALLOC_DEFAULT_BASE;



/*

 * vmalloc=size forces the vmalloc area to be exactly 'size'