Commit 99419aac authored Jun 19, 2019 by Greg Kroah-Hartman

Merge 4.14.128 into android-4.14-q



Changes in 4.14.128
	drm/nouveau: add kconfig option to turn off nouveau legacy contexts. (v3)
	nouveau: Fix build with CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT disabled
	HID: wacom: Correct button numbering 2nd-gen Intuos Pro over Bluetooth
	HID: wacom: Sync INTUOSP2_BT touch state after each frame if necessary
	ALSA: oxfw: allow PCM capture for Stanton SCS.1m
	ALSA: hda/realtek - Update headset mode for ALC256
	ALSA: firewire-motu: fix destruction of data for isochronous resources
	libata: Extend quirks for the ST1000LM024 drives with NOLPM quirk
	mm/list_lru.c: fix memory leak in __memcg_init_list_lru_node
	fs/ocfs2: fix race in ocfs2_dentry_attach_lock()
	mm/vmscan.c: fix trying to reclaim unevictable LRU page
	signal/ptrace: Don't leak unitialized kernel memory with PTRACE_PEEK_SIGINFO
	ptrace: restore smp_rmb() in __ptrace_may_access()
	media: v4l2-ioctl: clear fields in s_parm
	iommu/arm-smmu: Avoid constant zero in TLBI writes
	i2c: acorn: fix i2c warning
	bcache: fix stack corruption by PRECEDING_KEY()
	cgroup: Use css_tryget() instead of css_tryget_online() in task_get_css()
	ASoC: cs42xx8: Add regcache mask dirty
	ASoC: fsl_asrc: Fix the issue about unsupported rate
	drm/i915/sdvo: Implement proper HDMI audio support for SDVO
	x86/uaccess, kcov: Disable stack protector
	ALSA: seq: Protect in-kernel ioctl calls with mutex
	ALSA: seq: Fix race of get-subscription call vs port-delete ioctls
	Revert "ALSA: seq: Protect in-kernel ioctl calls with mutex"
	s390/kasan: fix strncpy_from_user kasan checks
	Drivers: misc: fix out-of-bounds access in function param_set_kgdbts_var
	scsi: qedi: remove memset/memcpy to nfunc and use func instead
	scsi: qedi: remove set but not used variables 'cdev' and 'udev'
	scsi: lpfc: add check for loss of ndlp when sending RRQ
	arm64/mm: Inhibit huge-vmap with ptdump
	nvme: remove the ifdef around nvme_nvm_ioctl
	platform/x86: pmc_atom: Add Lex 3I380D industrial PC to critclk_systems DMI table
	platform/x86: pmc_atom: Add several Beckhoff Automation boards to critclk_systems DMI table
	scsi: bnx2fc: fix incorrect cast to u64 on shift operation
	libnvdimm: Fix compilation warnings with W=1
	selftests/timers: Add missing fflush(stdout) calls
	usbnet: ipheth: fix racing condition
	KVM: x86/pmu: do not mask the value that is written to fixed PMUs
	KVM: s390: fix memory slot handling for KVM_SET_USER_MEMORY_REGION
	drm/vmwgfx: integer underflow in vmw_cmd_dx_set_shader() leading to an invalid read
	drm/vmwgfx: NULL pointer dereference from vmw_cmd_dx_view_define()
	usb: dwc2: Fix DMA cache alignment issues
	usb: dwc2: host: Fix wMaxPacketSize handling (fix webcam regression)
	USB: Fix chipmunk-like voice when using Logitech C270 for recording audio.
	USB: usb-storage: Add new ID to ums-realtek
	USB: serial: pl2303: add Allied Telesis VT-Kit3
	USB: serial: option: add support for Simcom SIM7500/SIM7600 RNDIS mode
	USB: serial: option: add Telit 0x1260 and 0x1261 compositions
	RAS/CEC: Fix binary search function
	x86/microcode, cpuhotplug: Add a microcode loader CPU hotplug callback
	x86/kasan: Fix boot with 5-level paging and KASAN
	rtc: pcf8523: don't return invalid date when battery is low
	Linux 4.14.128

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

parents bcc59d2c bb263a2a

Makefile

+1 −1

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

arch/arm64/mm/mmu.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -899,13 +899,18 @@ void *__init fixmap_remap_fdt(phys_addr_t dt_phys)

		int __init arch_ioremap_pud_supported(void)
		{
		/* only 4k granule supports level 1 block mappings */
		return IS_ENABLED(CONFIG_ARM64_4K_PAGES);
		/*
		* Only 4k granule supports level 1 block mappings.
		* SW table walks can't handle removal of intermediate entries.
		*/
		return IS_ENABLED(CONFIG_ARM64_4K_PAGES) &&
		!IS_ENABLED(CONFIG_ARM64_PTDUMP_DEBUGFS);
		}

		int __init arch_ioremap_pmd_supported(void)
		{
		return 1;
		/* See arch_ioremap_pud_supported() */
		return !IS_ENABLED(CONFIG_ARM64_PTDUMP_DEBUGFS);
		}

		int pud_set_huge(pud_t *pud, phys_addr_t phys, pgprot_t prot)

arch/s390/include/asm/uaccess.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -67,8 +67,10 @@ raw_copy_from_user(void to, const void __user from, unsigned long n);
		unsigned long __must_check
		raw_copy_to_user(void __user to, const void from, unsigned long n);

		#ifndef CONFIG_KASAN
		#define INLINE_COPY_FROM_USER
		#define INLINE_COPY_TO_USER
		#endif

		#ifdef CONFIG_HAVE_MARCH_Z10_FEATURES

arch/s390/kvm/kvm-s390.c

+21 −14

Original line number	Diff line number	Diff line
		@@ -3913,21 +3913,28 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
		const struct kvm_memory_slot *new,
		enum kvm_mr_change change)
		{
		int rc;

		/* If the basics of the memslot do not change, we do not want
		* to update the gmap. Every update causes several unnecessary
		* segment translation exceptions. This is usually handled just
		* fine by the normal fault handler + gmap, but it will also
		* cause faults on the prefix page of running guest CPUs.
		*/
		if (old->userspace_addr == mem->userspace_addr &&
		old->base_gfn * PAGE_SIZE == mem->guest_phys_addr &&
		old->npages * PAGE_SIZE == mem->memory_size)
		return;
		int rc = 0;

		switch (change) {
		case KVM_MR_DELETE:
		rc = gmap_unmap_segment(kvm->arch.gmap, old->base_gfn * PAGE_SIZE,
		old->npages * PAGE_SIZE);
		break;
		case KVM_MR_MOVE:
		rc = gmap_unmap_segment(kvm->arch.gmap, old->base_gfn * PAGE_SIZE,
		old->npages * PAGE_SIZE);
		if (rc)
		break;
		/* FALLTHROUGH */
		case KVM_MR_CREATE:
		rc = gmap_map_segment(kvm->arch.gmap, mem->userspace_addr,
		mem->guest_phys_addr, mem->memory_size);
		break;
		case KVM_MR_FLAGS_ONLY:
		break;
		default:
		WARN(1, "Unknown KVM MR CHANGE: %d\n", change);
		}
		if (rc)
		pr_warn("failed to commit memory region\n");
		return;

arch/x86/kernel/cpu/microcode/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -873,7 +873,7 @@ int __init microcode_init(void)
		goto out_ucode_group;

		register_syscore_ops(&mc_syscore_ops);
		cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "x86/microcode:online",
		cpuhp_setup_state_nocalls(CPUHP_AP_MICROCODE_LOADER, "x86/microcode:online",
		mc_cpu_online, mc_cpu_down_prep);

		pr_info("Microcode Update Driver: v%s.", DRIVER_VERSION);