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

Unverified Commit d8d1b827 authored by derfelot's avatar derfelot Committed by GitHub
Browse files

Merge pull request #37 from Flamefire/android-patches 

Add UPSTREAM, BACKPORT and FROMLIST Android patches
parents 29d87903 104d4788

arch/arm/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1281,7 +1281,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, 
		return -EFAULT;

	}



	if (is_vm_hugetlb_page(vma) && !logging_active) {

	if (vma_kernel_pagesize(vma) == PMD_SIZE && !logging_active) {

		hugetlb = true;

		gfn = (fault_ipa & PMD_MASK) >> PAGE_SHIFT;

	} else {

arch/arm64/include/asm/alternative.h

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ alternative_endif 


.macro user_alt, label, oldinstr, newinstr, cond

9999:	alternative_insn "\oldinstr", "\newinstr", \cond

	_ASM_EXTABLE 9999b, \label

	_asm_extable 9999b, \label

.endm



/*

arch/arm64/include/asm/stacktrace.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ struct stackframe { 
	unsigned long sp;

	unsigned long pc;

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

	unsigned int graph;

	int graph;

#endif

};

arch/arm64/kernel/cpufeature.c

+1 −1
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ static int __init parse_kpti(char *str) 
	__kpti_forced = enabled ? 1 : -1;

	return 0;

}

__setup("kpti=", parse_kpti);

early_param("kpti", parse_kpti);

#endif	/* CONFIG_UNMAP_KERNEL_AT_EL0 */



static const struct arm64_cpu_capabilities arm64_features[] = {

arch/arm64/kernel/kaslr.c

+7 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/sched.h>

#include <linux/types.h>



#include <asm/cacheflush.h>

#include <asm/fixmap.h>

#include <asm/kernel-pgtable.h>

#include <asm/memory.h>
@@ -42,7 +43,7 @@ static __init u64 get_kaslr_seed(void *fdt) 
	return ret;

}



static __init const u8 *get_cmdline(void *fdt)

static __init const u8 *kaslr_get_cmdline(void *fdt)

{

	static __initconst const u8 default_cmdline[] = CONFIG_CMDLINE;
@@ -86,6 +87,7 @@ u64 __init kaslr_early_init(u64 dt_phys, u64 modulo_offset) 
	 * we end up running with module randomization disabled.

	 */

	module_alloc_base = (u64)_etext - MODULES_VSIZE;

	__flush_dcache_area(&module_alloc_base, sizeof(module_alloc_base));



	/*

	 * Try to map the FDT early. If this fails, we simply bail,
@@ -108,7 +110,7 @@ u64 __init kaslr_early_init(u64 dt_phys, u64 modulo_offset) 
	 * Check if 'nokaslr' appears on the command line, and

	 * return 0 if that is the case.

	 */

	cmdline = get_cmdline(fdt);

	cmdline = kaslr_get_cmdline(fdt);

	str = strstr(cmdline, "nokaslr");

	if (str == cmdline || (str > cmdline && *(str - 1) == ' '))

		return 0;
@@ -177,5 +179,8 @@ u64 __init kaslr_early_init(u64 dt_phys, u64 modulo_offset) 
	module_alloc_base += (module_range * (seed & ((1 << 21) - 1))) >> 21;

	module_alloc_base &= PAGE_MASK;



	__flush_dcache_area(&module_alloc_base, sizeof(module_alloc_base));

	__flush_dcache_area(&memstart_offset_seed, sizeof(memstart_offset_seed));



	return offset;

}