Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07e13892 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.14.35 into android-4.14 



Changes in 4.14.35
	netfilter: ipset: Missing nfnl_lock()/nfnl_unlock() is added to ip_set_net_exit()
	cdc_ether: flag the Cinterion AHS8 modem by gemalto as WWAN
	rds: MP-RDS may use an invalid c_path
	slip: Check if rstate is initialized before uncompressing
	vhost: fix vhost_vq_access_ok() log check
	vhost: Fix vhost_copy_to_user()
	lan78xx: Correctly indicate invalid OTP
	media: v4l2-compat-ioctl32: don't oops on overlay
	media: v4l: vsp1: Fix header display list status check in continuous mode
	parisc: Fix out of array access in match_pci_device()
	parisc: Fix HPMC handler by increasing size to multiple of 16 bytes
	Drivers: hv: vmbus: do not mark HV_PCIE as perf_device
	PCI: hv: Serialize the present and eject work items
	KVM: PPC: Book3S HV: trace_tlbie must not be called in realmode
	perf intel-pt: Fix overlap detection to identify consecutive buffers correctly
	perf intel-pt: Fix sync_switch
	perf intel-pt: Fix error recovery from missing TIP packet
	perf intel-pt: Fix timestamp following overflow
	perf/core: Fix use-after-free in uprobe_perf_close()
	radeon: hide pointless #warning when compile testing
	x86/MCE/AMD: Define a function to get SMCA bank type
	scsi: qla2xxx: Fix small memory leak in qla2x00_probe_one on probe failure
	apparmor: fix logging of the existence test for signals
	apparmor: fix display of .ns_name for containers
	apparmor: fix resource audit messages when auditing peer
	block/loop: fix deadlock after loop_set_status
	nfit: fix region registration vs block-data-window ranges
	s390/qdio: don't retry EQBS after CCQ 96
	s390/qdio: don't merge ERROR output buffers
	s390/ipl: ensure loadparm valid flag is set
	get_user_pages_fast(): return -EFAULT on access_ok failure
	getname_kernel() needs to make sure that ->name != ->iname in long case
	Bluetooth: Fix connection if directed advertising and privacy is used
	Bluetooth: hci_bcm: Treat Interrupt ACPI resources as always being active-low
	rtl8187: Fix NULL pointer dereference in priv->conf_mutex
	x86/MCE: Report only DRAM ECC as memory errors on AMD systems
	x86/mce/AMD: Pass the bank number to smca_get_bank_type()
	x86/mce/AMD, EDAC/mce_amd: Enumerate Reserved SMCA bank type
	x86/mce/AMD: Get address from already initialized block
	hwmon: (ina2xx) Fix access to uninitialized mutex
	ath9k: Protect queue draining by rcu_read_lock()
	sunrpc: remove incorrect HMAC request initialization
	f2fs: fix heap mode to reset it back
	lib: fix stall in __bitmap_parselist()
	blk-mq: don't keep offline CPUs mapped to hctx 0
	ovl: fix lookup with middle layer opaque dir and absolute path redirects
	xen: xenbus_dev_frontend: Fix XS_TRANSACTION_END handling
	hugetlbfs: fix bug in pgoff overflow checking
	nfsd: fix incorrect umasks
	Linux 4.14.35

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents a6bbdb91 672f07d8

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 34

SUBLEVEL = 35

EXTRAVERSION =

NAME = Petit Gorille

arch/parisc/kernel/drivers.c

+4 −0
Original line number Diff line number Diff line
@@ -651,6 +651,10 @@ static int match_pci_device(struct device *dev, int index, 
					(modpath->mod == PCI_FUNC(devfn)));

	}



	/* index might be out of bounds for bc[] */

	if (index >= 6)

		return 0;



	id = PCI_SLOT(pdev->devfn) | (PCI_FUNC(pdev->devfn) << 5);

	return (modpath->bc[index] == id);

}

arch/parisc/kernel/hpmc.S

+5 −1
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ END(hpmc_pim_data) 
	.text



	.import intr_save, code

	.align 16

ENTRY_CFI(os_hpmc)

.os_hpmc:
@@ -300,12 +301,15 @@ os_hpmc_6: 


	b .

	nop

	.align 16	/* make function length multiple of 16 bytes */

ENDPROC_CFI(os_hpmc)

.os_hpmc_end:





	__INITRODATA

.globl os_hpmc_size

	.align 4

	.export os_hpmc_size

	.type   os_hpmc_size, @object

	.size   os_hpmc_size, 4

os_hpmc_size:

	.word .os_hpmc_end-.os_hpmc

arch/powerpc/kvm/book3s_hv_rm_mmu.c

+0 −4
Original line number Diff line number Diff line
@@ -447,8 +447,6 @@ static void do_tlbies(struct kvm *kvm, unsigned long *rbvalues, 
		for (i = 0; i < npages; ++i) {

			asm volatile(PPC_TLBIE_5(%0,%1,0,0,0) : :

				     "r" (rbvalues[i]), "r" (kvm->arch.lpid));

			trace_tlbie(kvm->arch.lpid, 0, rbvalues[i],

				kvm->arch.lpid, 0, 0, 0);

		}

		asm volatile("eieio; tlbsync; ptesync" : : : "memory");

		kvm->arch.tlbie_lock = 0;
@@ -458,8 +456,6 @@ static void do_tlbies(struct kvm *kvm, unsigned long *rbvalues, 
		for (i = 0; i < npages; ++i) {

			asm volatile(PPC_TLBIEL(%0,%1,0,0,0) : :

				     "r" (rbvalues[i]), "r" (0));

			trace_tlbie(kvm->arch.lpid, 1, rbvalues[i],

				0, 0, 0, 0);

		}

		asm volatile("ptesync" : : : "memory");

	}

arch/s390/kernel/ipl.c

+1 −0
Original line number Diff line number Diff line
@@ -799,6 +799,7 @@ static ssize_t reipl_generic_loadparm_store(struct ipl_parameter_block *ipb, 
	/* copy and convert to ebcdic */

	memcpy(ipb->hdr.loadparm, buf, lp_len);

	ASCEBC(ipb->hdr.loadparm, LOADPARM_LEN);

	ipb->hdr.flags |= DIAG308_FLAGS_LP_VALID;

	return len;

}