Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2faab1e authored by Dmitry Shmidt's avatar Dmitry Shmidt
Browse files

Merge remote-tracking branch 'common/android-4.4' into android-4.4.y

parents 14de94f0 663cc539

arch/arm64/include/asm/pgtable.h

+3 −2
Original line number Diff line number Diff line
@@ -40,13 +40,14 @@ 
 * VMALLOC_END: extends to the available space below vmmemmap, PCI I/O space,

 *	fixed mappings and modules

 */

#define VMEMMAP_SIZE		ALIGN((1UL << (VA_BITS - PAGE_SHIFT - 1)) * sizeof(struct page), PUD_SIZE)

#define VMEMMAP_SIZE		ALIGN((1UL << (VA_BITS - PAGE_SHIFT)) * sizeof(struct page), PUD_SIZE)



#define VMALLOC_START		(MODULES_END)

#define VMALLOC_END		(PAGE_OFFSET - PUD_SIZE - VMEMMAP_SIZE - SZ_64K)



#define VMEMMAP_START		(VMALLOC_END + SZ_64K)

#define vmemmap			((struct page *)VMEMMAP_START - (memstart_addr >> PAGE_SHIFT))

#define vmemmap			((struct page *)VMEMMAP_START - \

				 SECTION_ALIGN_DOWN(memstart_addr >> PAGE_SHIFT))



#define FIRST_USER_ADDRESS	0UL

arch/arm64/kernel/head.S

+6 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/irqchip/arm-gic-v3.h>



#include <asm/assembler.h>

#include <asm/boot.h>

#include <asm/ptrace.h>

#include <asm/asm-offsets.h>

#include <asm/cache.h>
@@ -210,8 +211,8 @@ section_table: 
ENTRY(stext)

	bl	preserve_boot_args

	bl	el2_setup			// Drop to EL1, w20=cpu_boot_mode

	mov	x23, xzr			// KASLR offset, defaults to 0

	adrp	x24, __PHYS_OFFSET

	and	x23, x24, MIN_KIMG_ALIGN - 1	// KASLR offset, defaults to 0

	bl	set_cpu_boot_mode_flag

	bl	__create_page_tables		// x25=TTBR0, x26=TTBR1

	/*
@@ -488,11 +489,13 @@ __mmap_switched: 
	bl	kasan_early_init

#endif

#ifdef CONFIG_RANDOMIZE_BASE

	cbnz	x23, 0f				// already running randomized?

	tst	x23, ~(MIN_KIMG_ALIGN - 1)	// already running randomized?

	b.ne	0f

	mov	x0, x21				// pass FDT address in x0

	mov	x1, x23				// pass modulo offset in x1

	bl	kaslr_early_init		// parse FDT for KASLR options

	cbz	x0, 0f				// KASLR disabled? just proceed

	mov	x23, x0				// record KASLR offset

	orr	x23, x23, x0			// record KASLR offset

	ret	x28				// we must enable KASLR, return

						// to __enable_mmu()

0:

arch/arm64/kernel/kaslr.c

+3 −3
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ extern void *__init __fixmap_remap_fdt(phys_addr_t dt_phys, int *size, 
 * containing function pointers) to be reinitialized, and zero-initialized

 * .bss variables will be reset to 0.

 */

u64 __init kaslr_early_init(u64 dt_phys)

u64 __init kaslr_early_init(u64 dt_phys, u64 modulo_offset)

{

	void *fdt;

	u64 seed, offset, mask, module_range;
@@ -132,8 +132,8 @@ u64 __init kaslr_early_init(u64 dt_phys) 
	 * boundary (for 4KB/16KB/64KB granule kernels, respectively). If this

	 * happens, increase the KASLR offset by the size of the kernel image.

	 */

	if ((((u64)_text + offset) >> SWAPPER_TABLE_SHIFT) !=

	    (((u64)_end + offset) >> SWAPPER_TABLE_SHIFT))

	if ((((u64)_text + offset + modulo_offset) >> SWAPPER_TABLE_SHIFT) !=

	    (((u64)_end + offset + modulo_offset) >> SWAPPER_TABLE_SHIFT))

		offset = (offset + (u64)(_end - _text)) & mask;



	if (IS_ENABLED(CONFIG_KASAN))