Commit 1614fe59 authored Feb 09, 2019 by Blagovest Kolenichev

Merge android-4.14-p.95 (ce2fcb98) into msm-4.14



* refs/heads/tmp-ce2fcb98:
  Revert "mmc: sdhci-msm: Disable CDR function on TX"
  Revert "scsi: core: Synchronize request queue PM status only on successful resume"
  Linux 4.14.95
  nbd: Use set_blocksize() to set device blocksize
  media: vb2: be sure to unlock mutex on errors
  drm/fb-helper: Ignore the value of fb_var_screeninfo.pixclock
  loop: drop caches if offset or block_size are changed
  loop: Fix double mutex_unlock(&loop_ctl_mutex) in loop_control_ioctl()
  loop: Get rid of loop_index_mutex
  loop: Fold __loop_release into loop_release
  block/loop: Use global lock for ioctl() operation.
  block/loop: Don't grab "struct file" for vfs_getattr() operation.
  tipc: fix uninit-value in tipc_nl_compat_doit
  tipc: fix uninit-value in tipc_nl_compat_name_table_dump
  tipc: fix uninit-value in tipc_nl_compat_link_set
  tipc: fix uninit-value in tipc_nl_compat_bearer_enable
  tipc: fix uninit-value in tipc_nl_compat_link_reset_stats
  sctp: allocate sctp_sockaddr_entry with kzalloc
  blockdev: Fix livelocks on loop device
  selinux: fix GPF on invalid policy
  netfilter: ebtables: account ebt_table_info to kmemcg
  sunrpc: handle ENOMEM in rpcb_getport_async
  media: vb2: vb2_mmap: move lock up
  LSM: Check for NULL cred-security on free
  bpf: in __bpf_redirect_no_mac pull mac only if present
  media: vivid: set min width/height to a value > 0
  media: vivid: fix error handling of kthread_run
  omap2fb: Fix stack memory disclosure
  Disable MSI also when pcie-octeon.pcie_disable on
  arm64: kaslr: ensure randomized quantities are clean to the PoC
  pstore/ram: Avoid allocation and leak of platform data
  media: v4l: ioctl: Validate num_planes for debug messages
  mfd: tps6586x: Handle interrupts on suspend
  OF: properties: add missing of_node_put
  MIPS: lantiq: Fix IPI interrupt handling
  mips: fix n32 compat_ipc_parse_version
  crypto: talitos - fix ablkcipher for CONFIG_VMAP_STACK
  crypto: talitos - reorder code in talitos_edesc_alloc()
  scsi: sd: Fix cache_type_store()
  scsi: core: Synchronize request queue PM status only on successful resume
  Yama: Check for pid death before checking ancestry
  btrfs: wait on ordered extents on abort cleanup
  Revert "btrfs: balance dirty metadata pages in btrfs_finish_ordered_io"
  crypto: authenc - fix parsing key with misaligned rta_len
  crypto: bcm - convert to use crypto_authenc_extractkeys()
  crypto: authencesn - Avoid twice completion call in decrypt path
  crypto: caam - fix zero-length buffer DMA mapping
  ip: on queued skb use skb_header_pointer instead of pskb_may_pull
  bonding: update nest level on unlink
  packet: Do not leak dev refcounts on error exit
  net: bridge: fix a bug on using a neighbour cache entry without checking its state
  ipv6: fix kernel-infoleak in ipv6_local_error()
  arm64: Don't trap host pointer auth use to EL2
  arm64/kvm: consistently handle host HCR_EL2 flags
  scsi: target: iscsi: cxgbit: fix csk leak
  Revert "scsi: target: iscsi: cxgbit: fix csk leak"
  sched/fair: Fix bandwidth timer clock drift condition
  media: em28xx: Fix misplaced reset of dev->v4l::field_count
  mmc: sdhci-msm: Disable CDR function on TX
  can: gw: ensure DLC boundaries after CAN frame modification
  tty: Don't hold ldisc lock in tty_reopen() if ldisc present
  tty: Simplify tty->count math in tty_reopen()
  tty: Hold tty_ldisc_lock() during tty_reopen()
  tty/ldsem: Wake up readers after timed out down_write()

Change-Id: If3702de0495c33760cacc27cff8821489302d572
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>

parents 2d15b054 478ae71a

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 14
		SUBLEVEL = 94
		SUBLEVEL = 95
		EXTRAVERSION =
		NAME = Petit Gorille

arch/arm64/include/asm/kvm_arm.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,8 @@
		#include <asm/types.h>

		/* Hyp Configuration Register (HCR) bits */
		#define HCR_API (UL(1) << 41)
		#define HCR_APK (UL(1) << 40)
		#define HCR_E2H (UL(1) << 34)
		#define HCR_ID (UL(1) << 33)
		#define HCR_CD (UL(1) << 32)
		@@ -82,6 +84,7 @@
		HCR_AMO \| HCR_SWIO \| HCR_TIDCP \| HCR_RW)
		#define HCR_VIRT_EXCP_MASK (HCR_VSE \| HCR_VI \| HCR_VF)
		#define HCR_INT_OVERRIDE (HCR_FMO \| HCR_IMO)
		#define HCR_HOST_NVHE_FLAGS (HCR_RW \| HCR_API \| HCR_APK)
		#define HCR_HOST_VHE_FLAGS (HCR_RW \| HCR_TGE \| HCR_E2H)

		/* TCR_EL2 Registers bits */

arch/arm64/kernel/head.S

+2 −3

Original line number	Diff line number	Diff line
		@@ -414,10 +414,9 @@ CPU_LE( bic x0, x0, #(1 << 25) ) // Clear the EE bit for EL2
		#endif

		/* Hyp configuration. */
		mov x0, #HCR_RW // 64-bit EL1
		mov_q x0, HCR_HOST_NVHE_FLAGS
		cbz x2, set_hcr
		orr x0, x0, #HCR_TGE // Enable Host Extensions
		orr x0, x0, #HCR_E2H
		mov_q x0, HCR_HOST_VHE_FLAGS
		set_hcr:
		msr hcr_el2, x0
		isb

arch/arm64/kernel/kaslr.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -14,6 +14,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>
		@@ -43,7 +44,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;

		@@ -109,7 +110,7 @@ u64 __init kaslr_early_init(u64 dt_phys)
		* 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;
		@@ -180,5 +181,8 @@ u64 __init kaslr_early_init(u64 dt_phys)
		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;
		}

arch/arm64/kvm/hyp/switch.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ static void __hyp_text __deactivate_traps_nvhe(void)
		mdcr_el2 \|= MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT;

		write_sysreg(mdcr_el2, mdcr_el2);
		write_sysreg(HCR_RW, hcr_el2);
		write_sysreg(HCR_HOST_NVHE_FLAGS, hcr_el2);
		write_sysreg(CPTR_EL2_DEFAULT, cptr_el2);
		}