Commit 1f4bd7c8 authored Jan 24, 2018 by Srinivasarao P

Merge android-4.4.111 (f8518889) into msm-4.4



* refs/heads/tmp-f8518889
  Linux 4.4.111
  Fix build error in vma.c
  Map the vsyscall page with _PAGE_USER
  proc: much faster /proc/vmstat
  module: Issue warnings when tainting kernel
  module: keep percpu symbols in module's symtab
  genksyms: Handle string literals with spaces in reference files
  x86/tlb: Drop the _GPL from the cpu_tlbstate export
  parisc: Fix alignment of pa_tlb_lock in assembly on 32-bit SMP kernel
  x86/microcode/AMD: Add support for fam17h microcode loading
  Input: elantech - add new icbody type 15
  ARC: uaccess: dont use "l" gcc inline asm constraint modifier
  kernel/signal.c: remove the no longer needed SIGNAL_UNKILLABLE check in complete_signal()
  kernel/signal.c: protect the SIGNAL_UNKILLABLE tasks from !sig_kernel_only() signals
  kernel/signal.c: protect the traced SIGNAL_UNKILLABLE tasks from SIGKILL
  kernel: make groups_sort calling a responsibility group_info allocators
  fscache: Fix the default for fscache_maybe_release_page()
  sunxi-rsb: Include OF based modalias in device uevent
  crypto: pcrypt - fix freeing pcrypt instances
  crypto: chacha20poly1305 - validate the digest size
  crypto: n2 - cure use after free
  kernel/acct.c: fix the acct->needcheck check in check_free_space()
  x86/kasan: Write protect kasan zero shadow
  clocksource: arch_timer: make virtual counter access configurable
  arm64: issue isb when trapping CNTVCT_EL0 access
  BACKPORT: arm64: Add CNTFRQ_EL0 trap handler
  BACKPORT: arm64: Add CNTVCT_EL0 trap handler
  ANDROID: sdcardfs: Fix missing break on default_normal
  ANDROID: usb: f_fs: Prevent gadget unbind if it is already unbound
  arm64: Kconfig: Reword UNMAP_KERNEL_AT_EL0 kconfig entry
  arm64: use RET instruction for exiting the trampoline
  FROMLIST: arm64: kaslr: Put kernel vectors address in separate data page
  FROMLIST: arm64: mm: Introduce TTBR_ASID_MASK for getting at the ASID in the TTBR
  FROMLIST: arm64: Kconfig: Add CONFIG_UNMAP_KERNEL_AT_EL0
  FROMLIST: arm64: entry: Add fake CPU feature for unmapping the kernel at EL0
  FROMLIST: arm64: tls: Avoid unconditional zeroing of tpidrro_el0 for native tasks
  FROMLIST: arm64: erratum: Work around Falkor erratum #E1003 in trampoline code
  FROMLIST: arm64: entry: Hook up entry trampoline to exception vectors
  FROMLIST: arm64: entry: Explicitly pass exception level to kernel_ventry macro
  FROMLIST: arm64: mm: Map entry trampoline into trampoline and kernel page tables
  FROMLIST: arm64: entry: Add exception trampoline page for exceptions from EL0
  FROMLIST: arm64: mm: Invalidate both kernel and user ASIDs when performing TLBI
  FROMLIST: arm64: mm: Add arm64_kernel_unmapped_at_el0 helper
  FROMLIST: arm64: mm: Allocate ASIDs in pairs
  FROMLIST: arm64: mm: Fix and re-enable ARM64_SW_TTBR0_PAN
  FROMLIST: arm64: mm: Move ASID from TTBR0 to TTBR1
  FROMLIST: arm64: mm: Temporarily disable ARM64_SW_TTBR0_PAN
  FROMLIST: arm64: mm: Use non-global mappings for kernel space
  UPSTREAM: arm64: factor out entry stack manipulation
  UPSTREAM: arm64: tlbflush.h: add __tlbi() macro

Conflicts:
	arch/arm64/include/asm/cpufeature.h
	arch/arm64/kernel/asm-offsets.c
	arch/arm64/kernel/cpufeature.c
	arch/arm64/kernel/entry.S
	arch/arm64/kernel/vmlinux.lds.S
	drivers/clocksource/Kconfig
	drivers/clocksource/arm_arch_timer.c
	drivers/usb/gadget/function/f_fs.c

Change-Id: I41e84762e30c9a7b1e283850c3f780f3dbe86f44
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>

parents a5cabe93 f8518889

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 110
		SUBLEVEL = 111
		EXTRAVERSION =
		NAME = Blurry Fish Butt

arch/arc/include/asm/uaccess.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -673,6 +673,7 @@ __arc_strncpy_from_user(char dst, const char __user src, long count)
		return 0;

		__asm__ __volatile__(
		" mov lp_count, %5 \n"
		" lp 3f \n"
		"1: ldb.ab %3, [%2, 1] \n"
		" breq.d %3, 0, 3f \n"
		@@ -689,8 +690,8 @@ __arc_strncpy_from_user(char dst, const char __user src, long count)
		" .word 1b, 4b \n"
		" .previous \n"
		: "+r"(res), "+r"(dst), "+r"(src), "=r"(val)
		: "g"(-EFAULT), "l"(count)
		: "memory");
		: "g"(-EFAULT), "r"(count)
		: "lp_count", "lp_start", "lp_end", "memory");

		return res;
		}

arch/arm64/Kconfig

+12 −0

Original line number	Diff line number	Diff line
		@@ -797,6 +797,18 @@ config FORCE_MAX_ZONEORDER
		However for 4K, we choose a higher default value, 11 as opposed to 10, giving us
		4M allocations matching the default size used by generic code.

		config UNMAP_KERNEL_AT_EL0
		bool "Unmap kernel when running in userspace (aka \"KAISER\")" if EXPERT
		default y
		help
		Speculation attacks against some high-performance processors can
		be used to bypass MMU permission checks and leak kernel data to
		userspace. This can be defended against by unmapping the kernel
		when running in userspace, mapping it back in on exception entry
		via a trampoline page in the vector table.

		If unsure, say Y.

		menuconfig ARMV8_DEPRECATED
		bool "Emulate deprecated/obsolete ARMv8 instructions"
		depends on COMPAT

arch/arm64/include/asm/cpufeature.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,8 @@

		#define ARM64_WORKAROUND_CAVIUM_27456 11
		#define ARM64_HAS_VIRT_HOST_EXTN 12
		#define ARM64_NCAPS 13
		#define ARM64_UNMAP_KERNEL_AT_EL0 23
		#define ARM64_NCAPS 24

		#ifndef __ASSEMBLY__

arch/arm64/include/asm/fixmap.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,11 @@ enum fixed_addresses {

		FIX_EARLYCON_MEM_BASE,
		FIX_TEXT_POKE0,
		#ifdef CONFIG_UNMAP_KERNEL_AT_EL0
		FIX_ENTRY_TRAMP_DATA,
		FIX_ENTRY_TRAMP_TEXT,
		#define TRAMP_VALIAS (__fix_to_virt(FIX_ENTRY_TRAMP_TEXT))
		#endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */
		__end_of_permanent_fixed_addresses,

		/*