Commit a4834780 authored May 28, 2020 by Greg Kroah-Hartman

Merge 4.19.125 into android-4.19-stable



Changes in 4.19.125
	x86/uaccess, ubsan: Fix UBSAN vs. SMAP
	ubsan: build ubsan.c more conservatively
	i2c: dev: Fix the race between the release of i2c_dev and cdev
	KVM: SVM: Fix potential memory leak in svm_cpu_init()
	riscv: set max_pfn to the PFN of the last page
	ima: Set file->f_mode instead of file->f_flags in ima_calc_file_hash()
	evm: Check also if *tfm is an error pointer in init_desc()
	ima: Fix return value of ima_write_policy()
	mtd: spinand: Propagate ECC information to the MTD structure
	fix multiplication overflow in copy_fdtable()
	ubifs: remove broken lazytime support
	iommu/amd: Fix over-read of ACPI UID from IVRS table
	i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()'
	ubi: Fix seq_file usage in detailed_erase_block_info debugfs file
	gcc-common.h: Update for GCC 10
	HID: multitouch: add eGalaxTouch P80H84 support
	HID: alps: Add AUI1657 device ID
	HID: alps: ALPS_1657 is too specific; use U1_UNICORN_LEGACY instead
	scsi: qla2xxx: Fix hang when issuing nvme disconnect-all in NPIV
	scsi: qla2xxx: Delete all sessions before unregister local nvme port
	configfs: fix config_item refcnt leak in configfs_rmdir()
	vhost/vsock: fix packet delivery order to monitoring devices
	aquantia: Fix the media type of AQC100 ethernet controller in the driver
	component: Silence bind error on -EPROBE_DEFER
	scsi: ibmvscsi: Fix WARN_ON during event pool release
	HID: i2c-hid: reset Synaptics SYNA2393 on resume
	x86/apic: Move TSC deadline timer debug printk
	gtp: set NLM_F_MULTI flag in gtp_genl_dump_pdp()
	HID: quirks: Add HID_QUIRK_NO_INIT_REPORTS quirk for Dell K12A keyboard-dock
	ceph: fix double unlock in handle_cap_export()
	stmmac: fix pointer check after utilization in stmmac_interrupt
	USB: core: Fix misleading driver bug report
	platform/x86: asus-nb-wmi: Do not load on Asus T100TA and T200TA
	ARM: futex: Address build warning
	padata: Replace delayed timer with immediate workqueue in padata_reorder
	padata: initialize pd->cpu with effective cpumask
	padata: purge get_cpu and reorder_via_wq from padata_do_serial
	ALSA: iec1712: Initialize STDSP24 properly when using the model=staudio option
	ALSA: pcm: fix incorrect hw_base increase
	ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Xtreme
	ALSA: hda/realtek - Add more fixup entries for Clevo machines
	drm/etnaviv: fix perfmon domain interation
	apparmor: Fix use-after-free in aa_audit_rule_init
	apparmor: fix potential label refcnt leak in aa_change_profile
	apparmor: Fix aa_label refcnt leak in policy_update
	dmaengine: tegra210-adma: Fix an error handling path in 'tegra_adma_probe()'
	dmaengine: owl: Use correct lock in owl_dma_get_pchan()
	drm/i915/gvt: Init DPLL/DDI vreg for virtual display instead of inheritance.
	powerpc: Remove STRICT_KERNEL_RWX incompatibility with RELOCATABLE
	powerpc/64s: Disable STRICT_KERNEL_RWX
	nfit: Add Hyper-V NVDIMM DSM command set to white list
	libnvdimm/btt: Remove unnecessary code in btt_freelist_init
	libnvdimm/btt: Fix LBA masking during 'free list' population
	staging: most: core: replace strcpy() by strscpy()
	thunderbolt: Drop duplicated get_switch_at_route()
	media: fdp1: Fix R-Car M3-N naming in debug message
	Revert "net/ibmvnic: Fix EOI when running in XIVE mode"
	net: bcmgenet: code movement
	net: bcmgenet: abort suspend on error
	cxgb4: free mac_hlist properly
	cxgb4/cxgb4vf: Fix mac_hlist initialization and free
	tty: serial: qcom_geni_serial: Fix wrap around of TX buffer
	brcmfmac: abort and release host after error
	Revert "gfs2: Don't demote a glock until its revokes are written"
	staging: iio: ad2s1210: Fix SPI reading
	staging: greybus: Fix uninitialized scalar variable
	iio: sca3000: Remove an erroneous 'get_device()'
	iio: dac: vf610: Fix an error handling path in 'vf610_dac_probe()'
	misc: rtsx: Add short delay after exit from ASPM
	mei: release me_cl object reference
	ipack: tpci200: fix error return code in tpci200_register()
	rapidio: fix an error in get_user_pages_fast() error handling
	rxrpc: Fix a memory leak in rxkad_verify_response()
	x86/unwind/orc: Fix unwind_get_return_address_ptr() for inactive tasks
	iio: adc: stm32-adc: Use dma_request_chan() instead dma_request_slave_channel()
	iio: adc: stm32-adc: fix device used to request dma
	iio: adc: stm32-dfsdm: Use dma_request_chan() instead dma_request_slave_channel()
	iio: adc: stm32-dfsdm: fix device used to request dma
	rxrpc: Trace discarded ACKs
	rxrpc: Fix ack discard
	Linux 4.19.125

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

parents 15a4eab0 2d16cf48

Makefile

+1 −1

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

arch/arm/include/asm/futex.h

+7 −2

Original line number	Diff line number	Diff line
		@@ -163,7 +163,12 @@ arch_futex_atomic_op_inuser(int op, int oparg, int oval, u32 __user uaddr)
		preempt_enable();
		#endif

		if (!ret)
		/*
		* Store unconditionally. If ret != 0 the extra store is the least
		* of the worries but GCC cannot figure out that __futex_atomic_op()
		* is either setting ret to -EFAULT or storing the old value in
		* oldval which results in a uninitialized warning at the call site.
		*/
		*oval = oldval;

		return ret;

arch/powerpc/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@ config PPC
		select ARCH_HAS_MEMBARRIER_CALLBACKS
		select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE
		select ARCH_HAS_SG_CHAIN
		select ARCH_HAS_STRICT_KERNEL_RWX if ((PPC_BOOK3S_64 \|\| PPC32) && !RELOCATABLE && !HIBERNATION)
		select ARCH_HAS_STRICT_KERNEL_RWX if (PPC32 && !HIBERNATION)
		select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
		select ARCH_HAS_UACCESS_FLUSHCACHE if PPC64
		select ARCH_HAS_UBSAN_SANITIZE_ALL

arch/riscv/kernel/setup.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		* to the Free Software Foundation, Inc.,
		*/

		#include <linux/bootmem.h>
		#include <linux/init.h>
		#include <linux/mm.h>
		#include <linux/memblock.h>
		@@ -187,6 +188,7 @@ static void __init setup_bootmem(void)

		set_max_mapnr(PFN_DOWN(mem_size));
		max_low_pfn = PFN_DOWN(memblock_end_of_DRAM());
		max_pfn = max_low_pfn;

		#ifdef CONFIG_BLK_DEV_INITRD
		setup_initrd();

arch/x86/kernel/apic/apic.c

+14 −13

Original line number	Diff line number	Diff line
		@@ -345,8 +345,6 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)
		* According to Intel, MFENCE can do the serialization here.
		*/
		asm volatile("mfence" : : : "memory");

		printk_once(KERN_DEBUG "TSC deadline timer enabled\n");
		return;
		}

		@@ -545,7 +543,7 @@ static DEFINE_PER_CPU(struct clock_event_device, lapic_events);
		#define DEADLINE_MODEL_MATCH_REV(model, rev) \
		{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)rev }

		static u32 hsx_deadline_rev(void)
		static __init u32 hsx_deadline_rev(void)
		{
		switch (boot_cpu_data.x86_stepping) {
		case 0x02: return 0x3a; /* EP */
		@@ -555,7 +553,7 @@ static u32 hsx_deadline_rev(void)
		return ~0U;
		}

		static u32 bdx_deadline_rev(void)
		static __init u32 bdx_deadline_rev(void)
		{
		switch (boot_cpu_data.x86_stepping) {
		case 0x02: return 0x00000011;
		@@ -567,7 +565,7 @@ static u32 bdx_deadline_rev(void)
		return ~0U;
		}

		static u32 skx_deadline_rev(void)
		static __init u32 skx_deadline_rev(void)
		{
		switch (boot_cpu_data.x86_stepping) {
		case 0x03: return 0x01000136;
		@@ -580,7 +578,7 @@ static u32 skx_deadline_rev(void)
		return ~0U;
		}

		static const struct x86_cpu_id deadline_match[] = {
		static const struct x86_cpu_id deadline_match[] __initconst = {
		DEADLINE_MODEL_MATCH_FUNC( INTEL_FAM6_HASWELL_X, hsx_deadline_rev),
		DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_BROADWELL_X, 0x0b000020),
		DEADLINE_MODEL_MATCH_FUNC( INTEL_FAM6_BROADWELL_XEON_D, bdx_deadline_rev),
		@@ -602,18 +600,19 @@ static const struct x86_cpu_id deadline_match[] = {
		{},
		};

		static void apic_check_deadline_errata(void)
		static __init bool apic_validate_deadline_timer(void)
		{
		const struct x86_cpu_id *m;
		u32 rev;

		if (!boot_cpu_has(X86_FEATURE_TSC_DEADLINE_TIMER) \|\|
		boot_cpu_has(X86_FEATURE_HYPERVISOR))
		return;
		if (!boot_cpu_has(X86_FEATURE_TSC_DEADLINE_TIMER))
		return false;
		if (boot_cpu_has(X86_FEATURE_HYPERVISOR))
		return true;

		m = x86_match_cpu(deadline_match);
		if (!m)
		return;
		return true;

		/*
		* Function pointers will have the MSB set due to address layout,
		@@ -625,11 +624,12 @@ static void apic_check_deadline_errata(void)
		rev = (u32)m->driver_data;

		if (boot_cpu_data.microcode >= rev)
		return;
		return true;

		setup_clear_cpu_cap(X86_FEATURE_TSC_DEADLINE_TIMER);
		pr_err(FW_BUG "TSC_DEADLINE disabled due to Errata; "
		"please update microcode to version: 0x%x (or later)\n", rev);
		return false;
		}

		/*
		@@ -2023,7 +2023,8 @@ void __init init_apic_mappings(void)
		{
		unsigned int new_apicid;

		apic_check_deadline_errata();
		if (apic_validate_deadline_timer())
		pr_debug("TSC deadline timer available\n");

		if (x2apic_mode) {
		boot_cpu_physical_apicid = read_apic_id();