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

Commit 3534fdef authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.14.149 into android-4.14-q 



Changes in 4.14.149
	s390/process: avoid potential reading of freed stack
	KVM: s390: Test for bad access register and size at the start of S390_MEM_OP
	s390/topology: avoid firing events before kobjs are created
	s390/cio: avoid calling strlen on null pointer
	s390/cio: exclude subchannels with no parent from pseudo check
	KVM: PPC: Book3S HV: Don't lose pending doorbell request on migration on P9
	KVM: nVMX: handle page fault in vmread fix
	PM / devfreq: tegra: Fix kHz to Hz conversion
	ASoC: Define a set of DAPM pre/post-up events
	powerpc/powernv: Restrict OPAL symbol map to only be readable by root
	can: mcp251x: mcp251x_hw_reset(): allow more time after a reset
	tools lib traceevent: Fix "robust" test of do_generate_dynamic_list_file
	crypto: qat - Silence smp_processor_id() warning
	crypto: skcipher - Unmap pages after an external error
	crypto: cavium/zip - Add missing single_release()
	crypto: caam - fix concurrency issue in givencrypt descriptor
	usercopy: Avoid HIGHMEM pfn warning
	timer: Read jiffies once when forwarding base clk
	watchdog: imx2_wdt: fix min() calculation in imx2_wdt_set_timeout
	drm/omap: fix max fclk divider for omap36xx
	mmc: sdhci: improve ADMA error reporting
	mmc: sdhci-of-esdhc: set DMA snooping based on DMA coherence
	Revert "locking/pvqspinlock: Don't wait if vCPU is preempted"
	xen/xenbus: fix self-deadlock after killing user process
	ieee802154: atusb: fix use-after-free at disconnect
	cfg80211: initialize on-stack chandefs
	ima: always return negative code for error
	fs: nfs: Fix possible null-pointer dereferences in encode_attrs()
	9p: avoid attaching writeback_fid on mmap with type PRIVATE
	xen/pci: reserve MCFG areas earlier
	ceph: fix directories inode i_blkbits initialization
	ceph: reconnect connection if session hang in opening state
	watchdog: aspeed: Add support for AST2600
	netfilter: nf_tables: allow lookups in dynamic sets
	drm/amdgpu: Check for valid number of registers to read
	pNFS: Ensure we do clear the return-on-close layout stateid on fatal errors
	pwm: stm32-lp: Add check in case requested period cannot be achieved
	thermal: Fix use-after-free when unregistering thermal zone device
	fuse: fix memleak in cuse_channel_open
	sched/core: Fix migration to invalid CPU in __set_cpus_allowed_ptr()
	perf build: Add detection of java-11-openjdk-devel package
	kernel/elfcore.c: include proper prototypes
	perf unwind: Fix libunwind build failure on i386 systems
	KVM: PPC: Book3S HV: XIVE: Free escalation interrupts before disabling the VP
	nbd: fix crash when the blksize is zero
	block/ndb: add WQ_UNBOUND to the knbd-recv workqueue
	nbd: fix max number of supported devs
	powerpc/pseries: Fix cpu_hotplug_lock acquisition in resize_hpt()
	tools lib traceevent: Do not free tep->cmdlines in add_new_comm() on failure
	tick: broadcast-hrtimer: Fix a race in bc_set_next
	perf tools: Fix segfault in cpu_cache_level__read()
	perf stat: Fix a segmentation fault when using repeat forever
	perf stat: Reset previous counts on repeat with interval
	vfs: Fix EOVERFLOW testing in put_compat_statfs64
	coresight: etm4x: Use explicit barriers on enable/disable
	cfg80211: add and use strongly typed element iteration macros
	cfg80211: Use const more consistently in for_each_element macros
	nl80211: validate beacon head
	ASoC: sgtl5000: Improve VAG power and mute control
	Linux 4.14.149

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents a3fefa36 e132c8d7

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 148

SUBLEVEL = 149

EXTRAVERSION =

NAME = Petit Gorille

arch/powerpc/kvm/book3s_hv.c

+8 −1
Original line number Diff line number Diff line
@@ -1356,7 +1356,14 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, 
		*val = get_reg_val(id, vcpu->arch.pspb);

		break;

	case KVM_REG_PPC_DPDES:

		*val = get_reg_val(id, vcpu->arch.vcore->dpdes);

		/*

		 * On POWER9, where we are emulating msgsndp etc.,

		 * we return 1 bit for each vcpu, which can come from

		 * either vcore->dpdes or doorbell_request.

		 * On POWER8, doorbell_request is 0.

		 */

		*val = get_reg_val(id, vcpu->arch.vcore->dpdes |

				   vcpu->arch.doorbell_request);

		break;

	case KVM_REG_PPC_VTB:

		*val = get_reg_val(id, vcpu->arch.vcore->vtb);

arch/powerpc/kvm/book3s_xive.c

+10 −8
Original line number Diff line number Diff line
@@ -1001,20 +1001,22 @@ void kvmppc_xive_cleanup_vcpu(struct kvm_vcpu *vcpu) 
	/* Mask the VP IPI */

	xive_vm_esb_load(&xc->vp_ipi_data, XIVE_ESB_SET_PQ_01);



	/* Disable the VP */

	xive_native_disable_vp(xc->vp_id);



	/* Free the queues & associated interrupts */

	/* Free escalations */

	for (i = 0; i < KVMPPC_XIVE_Q_COUNT; i++) {

		struct xive_q *q = &xc->queues[i];



		/* Free the escalation irq */

		if (xc->esc_virq[i]) {

			free_irq(xc->esc_virq[i], vcpu);

			irq_dispose_mapping(xc->esc_virq[i]);

			kfree(xc->esc_virq_names[i]);

		}

		/* Free the queue */

	}



	/* Disable the VP */

	xive_native_disable_vp(xc->vp_id);



	/* Free the queues */

	for (i = 0; i < KVMPPC_XIVE_Q_COUNT; i++) {

		struct xive_q *q = &xc->queues[i];



		xive_native_disable_queue(xc->vp_id, q, i);

		if (q->qpage) {

			free_pages((unsigned long)q->qpage,

arch/powerpc/mm/hash_utils_64.c

+8 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/memblock.h>

#include <linux/context_tracking.h>

#include <linux/libfdt.h>

#include <linux/cpu.h>



#include <asm/debugfs.h>

#include <asm/processor.h>
@@ -1852,10 +1853,16 @@ static int hpt_order_get(void *data, u64 *val) 


static int hpt_order_set(void *data, u64 val)

{

	int ret;



	if (!mmu_hash_ops.resize_hpt)

		return -ENODEV;



	return mmu_hash_ops.resize_hpt(val);

	cpus_read_lock();

	ret = mmu_hash_ops.resize_hpt(val);

	cpus_read_unlock();



	return ret;

}



DEFINE_SIMPLE_ATTRIBUTE(fops_hpt_order, hpt_order_get, hpt_order_set, "%llu\n");

arch/powerpc/platforms/powernv/opal.c

+7 −4
Original line number Diff line number Diff line
@@ -617,7 +617,10 @@ static ssize_t symbol_map_read(struct file *fp, struct kobject *kobj, 
				       bin_attr->size);

}



static BIN_ATTR_RO(symbol_map, 0);

static struct bin_attribute symbol_map_attr = {

	.attr = {.name = "symbol_map", .mode = 0400},

	.read = symbol_map_read

};



static void opal_export_symmap(void)

{
@@ -634,10 +637,10 @@ static void opal_export_symmap(void) 
		return;



	/* Setup attributes */

	bin_attr_symbol_map.private = __va(be64_to_cpu(syms[0]));

	bin_attr_symbol_map.size = be64_to_cpu(syms[1]);

	symbol_map_attr.private = __va(be64_to_cpu(syms[0]));

	symbol_map_attr.size = be64_to_cpu(syms[1]);



	rc = sysfs_create_bin_file(opal_kobj, &bin_attr_symbol_map);

	rc = sysfs_create_bin_file(opal_kobj, &symbol_map_attr);

	if (rc)

		pr_warn("Error %d creating OPAL symbols file\n", rc);

}