Commit fd37e285 authored Jan 23, 2019 by Greg Kroah-Hartman

Merge 4.9.152 into android-4.9



Changes in 4.9.152
	tty/ldsem: Wake up readers after timed out down_write()
	tty: Hold tty_ldisc_lock() during tty_reopen()
	tty: Simplify tty->count math in tty_reopen()
	tty: Don't hold ldisc lock in tty_reopen() if ldisc present
	can: gw: ensure DLC boundaries after CAN frame modification
	Revert "f2fs: do not recover from previous remained wrong dnodes"
	media: em28xx: Fix misplaced reset of dev->v4l::field_count
	proc: Remove empty line in /proc/self/status
	Revert "scsi: target: iscsi: cxgbit: fix csk leak"
	scsi: target: iscsi: cxgbit: fix csk leak
	arm64/kvm: consistently handle host HCR_EL2 flags
	arm64: Don't trap host pointer auth use to EL2
	ipv6: fix kernel-infoleak in ipv6_local_error()
	net: bridge: fix a bug on using a neighbour cache entry without checking its state
	packet: Do not leak dev refcounts on error exit
	bonding: update nest level on unlink
	ip: on queued skb use skb_header_pointer instead of pskb_may_pull
	crypto: caam - fix zero-length buffer DMA mapping
	crypto: authencesn - Avoid twice completion call in decrypt path
	crypto: authenc - fix parsing key with misaligned rta_len
	btrfs: wait on ordered extents on abort cleanup
	Yama: Check for pid death before checking ancestry
	scsi: core: Synchronize request queue PM status only on successful resume
	scsi: sd: Fix cache_type_store()
	crypto: talitos - reorder code in talitos_edesc_alloc()
	crypto: talitos - fix ablkcipher for CONFIG_VMAP_STACK
	mips: fix n32 compat_ipc_parse_version
	mfd: tps6586x: Handle interrupts on suspend
	arm64: kaslr: ensure randomized quantities are clean to the PoC
	Disable MSI also when pcie-octeon.pcie_disable on
	omap2fb: Fix stack memory disclosure
	media: vivid: fix error handling of kthread_run
	media: vivid: set min width/height to a value > 0
	LSM: Check for NULL cred-security on free
	media: vb2: vb2_mmap: move lock up
	sunrpc: handle ENOMEM in rpcb_getport_async
	netfilter: ebtables: account ebt_table_info to kmemcg
	selinux: fix GPF on invalid policy
	blockdev: Fix livelocks on loop device
	sctp: allocate sctp_sockaddr_entry with kzalloc
	tipc: fix uninit-value in tipc_nl_compat_link_reset_stats
	tipc: fix uninit-value in tipc_nl_compat_bearer_enable
	tipc: fix uninit-value in tipc_nl_compat_link_set
	tipc: fix uninit-value in tipc_nl_compat_name_table_dump
	tipc: fix uninit-value in tipc_nl_compat_doit
	block/loop: Use global lock for ioctl() operation.
	loop: Fold __loop_release into loop_release
	loop: Get rid of loop_index_mutex
	loop: Fix double mutex_unlock(&loop_ctl_mutex) in loop_control_ioctl()
	drm/fb-helper: Ignore the value of fb_var_screeninfo.pixclock
	mm, memcg: fix reclaim deadlock with writeback
	media: vb2: be sure to unlock mutex on errors
	nbd: set the logical and physical blocksize properly
	nbd: Use set_blocksize() to set device blocksize
	Linux 4.9.152

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parents ea0c4ffb ef50e305

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 151
		SUBLEVEL = 152
		EXTRAVERSION =
		NAME = Roaring Lionus

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
		@@ -518,10 +518,9 @@ CPU_LE( bic x0, x0, #(3 << 24) ) // Clear the EE and E0E bits for EL1
		#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, 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;
		@@ -178,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;
		}

arch/arm64/kvm/hyp/switch.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ static void __hyp_text __deactivate_traps_vhe(void)

		static void __hyp_text __deactivate_traps_nvhe(void)
		{
		write_sysreg(HCR_RW, hcr_el2);
		write_sysreg(HCR_HOST_NVHE_FLAGS, hcr_el2);
		write_sysreg(CPTR_EL2_DEFAULT, cptr_el2);
		}