Commit 73dc755e authored Jan 23, 2019 by Greg Kroah-Hartman

Merge 4.19.17 into android-4.19



Changes in 4.19.17
	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
	netfilter: nf_conncount: replace CONNCOUNT_LOCK_SLOTS with CONNCOUNT_SLOTS
	netfilter: nf_conncount: don't skip eviction when age is negative
	netfilter: nf_conncount: split gc in two phases
	netfilter: nf_conncount: restart search when nodes have been erased
	netfilter: nf_conncount: merge lookup and add functions
	netfilter: nf_conncount: move all list iterations under spinlock
	netfilter: nf_conncount: speculative garbage collection on empty lists
	netfilter: nf_conncount: fix argument order to find_next_bit
	mmc: sdhci-msm: Disable CDR function on TX
	Revert "scsi: target: iscsi: cxgbit: fix csk leak"
	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
	tcp: change txhash on SYN-data timeout
	tun: publish tfile after it's fully initialized
	lan743x: Remove phy_read from link status change function
	smc: move unhash as early as possible in smc_release()
	r8169: don't try to read counters if chip is in a PCI power-save state
	bonding: update nest level on unlink
	ip: on queued skb use skb_header_pointer instead of pskb_may_pull
	r8169: load Realtek PHY driver module before r8169
	crypto: sm3 - fix undefined shift by >= width of value
	crypto: caam - fix zero-length buffer DMA mapping
	crypto: authencesn - Avoid twice completion call in decrypt path
	crypto: ccree - convert to use crypto_authenc_extractkeys()
	crypto: bcm - convert to use crypto_authenc_extractkeys()
	crypto: authenc - fix parsing key with misaligned rta_len
	crypto: talitos - reorder code in talitos_edesc_alloc()
	crypto: talitos - fix ablkcipher for CONFIG_VMAP_STACK
	xen: Fix x86 sched_clock() interface for xen
	Revert "btrfs: balance dirty metadata pages in btrfs_finish_ordered_io"
	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()
	mips: fix n32 compat_ipc_parse_version
	MIPS: BCM47XX: Setup struct device for the SoC
	MIPS: lantiq: Fix IPI interrupt handling
	drm/i915/gvt: Fix mmap range check
	OF: properties: add missing of_node_put
	mfd: tps6586x: Handle interrupts on suspend
	media: v4l: ioctl: Validate num_planes for debug messages
	RDMA/nldev: Don't expose unsafe global rkey to regular user
	RDMA/vmw_pvrdma: Return the correct opcode when creating WR
	kbuild: Disable LD_DEAD_CODE_DATA_ELIMINATION with ftrace & GCC <= 4.7
	net: dsa: realtek-smi: fix OF child-node lookup
	pstore/ram: Avoid allocation and leak of platform data
	arm64: kaslr: ensure randomized quantities are clean to the PoC
	arm64: dts: marvell: armada-ap806: reserve PSCI area
	Disable MSI also when pcie-octeon.pcie_disable on
	fix int_sqrt64() for very large numbers
	omap2fb: Fix stack memory disclosure
	media: vivid: fix error handling of kthread_run
	media: vivid: set min width/height to a value > 0
	bpf: in __bpf_redirect_no_mac pull mac only if present
	ipv6: make icmp6_send() robust against null skb->dev
	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
	block: use rcu_work instead of call_rcu to avoid sleep in softirq
	selinux: fix GPF on invalid policy
	blockdev: Fix livelocks on loop device
	sctp: allocate sctp_sockaddr_entry with kzalloc
	tipc: fix uninit-value in in tipc_conn_rcv_sub
	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: Don't grab "struct file" for vfs_getattr() operation.
	block/loop: Use global lock for ioctl() operation.
	loop: Fold __loop_release into loop_release
	loop: Get rid of loop_index_mutex
	loop: Push lo_ctl_mutex down into individual ioctls
	loop: Split setting of lo_state from loop_clr_fd
	loop: Push loop_ctl_mutex down into loop_clr_fd()
	loop: Push loop_ctl_mutex down to loop_get_status()
	loop: Push loop_ctl_mutex down to loop_set_status()
	loop: Push loop_ctl_mutex down to loop_set_fd()
	loop: Push loop_ctl_mutex down to loop_change_fd()
	loop: Move special partition reread handling in loop_clr_fd()
	loop: Move loop_reread_partitions() out of loop_ctl_mutex
	loop: Fix deadlock when calling blkdev_reread_part()
	loop: Avoid circular locking dependency between loop_ctl_mutex and bd_mutex
	loop: Get rid of 'nested' acquisition of loop_ctl_mutex
	loop: Fix double mutex_unlock(&loop_ctl_mutex) in loop_control_ioctl()
	loop: drop caches if offset or block_size are changed
	drm/fb-helper: Ignore the value of fb_var_screeninfo.pixclock
	selftests: Fix test errors related to lib.mk khdr target
	media: vb2: be sure to unlock mutex on errors
	nbd: Use set_blocksize() to set device blocksize
	Linux 4.19.17

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

parents 5f5d7b00 23b6b8bf

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 19
		SUBLEVEL = 16
		SUBLEVEL = 17
		EXTRAVERSION =
		NAME = "People's Front"

arch/arm64/boot/dts/marvell/armada-ap806.dtsi

+17 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,23 @@
		method = "smc";
		};

		reserved-memory {
		#address-cells = <2>;
		#size-cells = <2>;
		ranges;

		/*
		* This area matches the mapping done with a
		* mainline U-Boot, and should be updated by the
		* bootloader.
		*/

		psci-area@4000000 {
		reg = <0x0 0x4000000 0x0 0x200000>;
		no-map;
		};
		};

		ap806 {
		#address-cells = <2>;
		#size-cells = <2>;

arch/arm64/include/asm/kvm_arm.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@

		/* Hyp Configuration Register (HCR) bits */
		#define HCR_FWB (UL(1) << 46)
		#define HCR_API (UL(1) << 41)
		#define HCR_APK (UL(1) << 40)
		#define HCR_TEA (UL(1) << 37)
		#define HCR_TERR (UL(1) << 36)
		#define HCR_TLOR (UL(1) << 35)
		@@ -87,6 +89,7 @@
		HCR_AMO \| HCR_SWIO \| HCR_TIDCP \| HCR_RW \| HCR_TLOR \| \
		HCR_FMO \| HCR_IMO)
		#define HCR_VIRT_EXCP_MASK (HCR_VSE \| HCR_VI \| HCR_VF)
		#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
		@@ -494,10 +494,9 @@ ENTRY(el2_setup)
		#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;
		@@ -169,5 +170,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;
		}