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

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

Merge 4.9.73 into android-4.9 



Changes in 4.9.73
	ACPI: APEI / ERST: Fix missing error handling in erst_reader()
	acpi, nfit: fix health event notification
	crypto: mcryptd - protect the per-CPU queue with a lock
	mfd: cros ec: spi: Don't send first message too soon
	mfd: twl4030-audio: Fix sibling-node lookup
	mfd: twl6040: Fix child-node lookup
	ALSA: rawmidi: Avoid racy info ioctl via ctl device
	ALSA: usb-audio: Add native DSD support for Esoteric D-05X
	ALSA: usb-audio: Fix the missing ctl name suffix at parsing SU
	PCI / PM: Force devices to D0 in pci_pm_thaw_noirq()
	parisc: Hide Diva-built-in serial aux and graphics card
	spi: xilinx: Detect stall with Unknown commands
	pinctrl: cherryview: Mask all interrupts on Intel_Strago based systems
	KVM: X86: Fix load RFLAGS w/o the fixed bit
	kvm: x86: fix RSM when PCID is non-zero
	clk: sunxi: sun9i-mmc: Implement reset callback for reset controls
	powerpc/perf: Dereference BHRB entries safely
	libnvdimm, pfn: fix start_pad handling for aligned namespaces
	net: mvneta: clear interface link status on port disable
	net: mvneta: use proper rxq_number in loop on rx queues
	net: mvneta: eliminate wrong call to handle rx descriptor error
	bpf/verifier: Fix states_equal() comparison of pointer and UNKNOWN
	Linux 4.9.73

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

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 72

SUBLEVEL = 73

EXTRAVERSION =

NAME = Roaring Lionus

arch/powerpc/perf/core-book3s.c

+6 −2
Original line number Diff line number Diff line
@@ -401,8 +401,12 @@ static __u64 power_pmu_bhrb_to(u64 addr) 
	int ret;

	__u64 target;



	if (is_kernel_addr(addr))

		return branch_target((unsigned int *)addr);

	if (is_kernel_addr(addr)) {

		if (probe_kernel_read(&instr, (void *)addr, sizeof(instr)))

			return 0;



		return branch_target(&instr);

	}



	/* Userspace: need copy instruction here then translate it */

	pagefault_disable();

arch/x86/kvm/emulate.c

+25 −7
Original line number Diff line number Diff line
@@ -2395,9 +2395,21 @@ static int rsm_load_seg_64(struct x86_emulate_ctxt *ctxt, u64 smbase, int n) 
}



static int rsm_enter_protected_mode(struct x86_emulate_ctxt *ctxt,

				     u64 cr0, u64 cr4)

				    u64 cr0, u64 cr3, u64 cr4)

{

	int bad;

	u64 pcid;



	/* In order to later set CR4.PCIDE, CR3[11:0] must be zero.  */

	pcid = 0;

	if (cr4 & X86_CR4_PCIDE) {

		pcid = cr3 & 0xfff;

		cr3 &= ~0xfff;

	}



	bad = ctxt->ops->set_cr(ctxt, 3, cr3);

	if (bad)

		return X86EMUL_UNHANDLEABLE;



	/*

	 * First enable PAE, long mode needs it before CR0.PG = 1 is set.
@@ -2416,6 +2428,12 @@ static int rsm_enter_protected_mode(struct x86_emulate_ctxt *ctxt, 
		bad = ctxt->ops->set_cr(ctxt, 4, cr4);

		if (bad)

			return X86EMUL_UNHANDLEABLE;

		if (pcid) {

			bad = ctxt->ops->set_cr(ctxt, 3, cr3 | pcid);

			if (bad)

				return X86EMUL_UNHANDLEABLE;

		}



	}



	return X86EMUL_CONTINUE;
@@ -2426,11 +2444,11 @@ static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt, u64 smbase) 
	struct desc_struct desc;

	struct desc_ptr dt;

	u16 selector;

	u32 val, cr0, cr4;

	u32 val, cr0, cr3, cr4;

	int i;



	cr0 =                      GET_SMSTATE(u32, smbase, 0x7ffc);

	ctxt->ops->set_cr(ctxt, 3, GET_SMSTATE(u32, smbase, 0x7ff8));

	cr3 =                      GET_SMSTATE(u32, smbase, 0x7ff8);

	ctxt->eflags =             GET_SMSTATE(u32, smbase, 0x7ff4) | X86_EFLAGS_FIXED;

	ctxt->_eip =               GET_SMSTATE(u32, smbase, 0x7ff0);
@@ -2472,14 +2490,14 @@ static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt, u64 smbase) 


	ctxt->ops->set_smbase(ctxt, GET_SMSTATE(u32, smbase, 0x7ef8));



	return rsm_enter_protected_mode(ctxt, cr0, cr4);

	return rsm_enter_protected_mode(ctxt, cr0, cr3, cr4);

}



static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt, u64 smbase)

{

	struct desc_struct desc;

	struct desc_ptr dt;

	u64 val, cr0, cr4;

	u64 val, cr0, cr3, cr4;

	u32 base3;

	u16 selector;

	int i, r;
@@ -2496,7 +2514,7 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt, u64 smbase) 
	ctxt->ops->set_dr(ctxt, 7, (val & DR7_VOLATILE) | DR7_FIXED_1);



	cr0 =                       GET_SMSTATE(u64, smbase, 0x7f58);

	ctxt->ops->set_cr(ctxt, 3,  GET_SMSTATE(u64, smbase, 0x7f50));

	cr3 =                       GET_SMSTATE(u64, smbase, 0x7f50);

	cr4 =                       GET_SMSTATE(u64, smbase, 0x7f48);

	ctxt->ops->set_smbase(ctxt, GET_SMSTATE(u32, smbase, 0x7f00));

	val =                       GET_SMSTATE(u64, smbase, 0x7ed0);
@@ -2524,7 +2542,7 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt, u64 smbase) 
	dt.address =                GET_SMSTATE(u64, smbase, 0x7e68);

	ctxt->ops->set_gdt(ctxt, &dt);



	r = rsm_enter_protected_mode(ctxt, cr0, cr4);

	r = rsm_enter_protected_mode(ctxt, cr0, cr3, cr4);

	if (r != X86EMUL_CONTINUE)

		return r;

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -7132,7 +7132,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
#endif



	kvm_rip_write(vcpu, regs->rip);

	kvm_set_rflags(vcpu, regs->rflags);

	kvm_set_rflags(vcpu, regs->rflags | X86_EFLAGS_FIXED);



	vcpu->arch.exception.pending = false;

crypto/mcryptd.c

+10 −13
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static int mcryptd_init_queue(struct mcryptd_queue *queue, 
		pr_debug("cpu_queue #%d %p\n", cpu, queue->cpu_queue);

		crypto_init_queue(&cpu_queue->queue, max_cpu_qlen);

		INIT_WORK(&cpu_queue->work, mcryptd_queue_worker);

		spin_lock_init(&cpu_queue->q_lock);

	}

	return 0;

}
@@ -103,15 +104,16 @@ static int mcryptd_enqueue_request(struct mcryptd_queue *queue, 
	int cpu, err;

	struct mcryptd_cpu_queue *cpu_queue;



	cpu = get_cpu();

	cpu_queue = this_cpu_ptr(queue->cpu_queue);

	rctx->tag.cpu = cpu;

	cpu_queue = raw_cpu_ptr(queue->cpu_queue);

	spin_lock(&cpu_queue->q_lock);

	cpu = smp_processor_id();

	rctx->tag.cpu = smp_processor_id();



	err = crypto_enqueue_request(&cpu_queue->queue, request);

	pr_debug("enqueue request: cpu %d cpu_queue %p request %p\n",

		 cpu, cpu_queue, request);

	spin_unlock(&cpu_queue->q_lock);

	queue_work_on(cpu, kcrypto_wq, &cpu_queue->work);

	put_cpu();



	return err;

}
@@ -160,16 +162,11 @@ static void mcryptd_queue_worker(struct work_struct *work) 
	cpu_queue = container_of(work, struct mcryptd_cpu_queue, work);

	i = 0;

	while (i < MCRYPTD_BATCH || single_task_running()) {

		/*

		 * preempt_disable/enable is used to prevent

		 * being preempted by mcryptd_enqueue_request()

		 */

		local_bh_disable();

		preempt_disable();



		spin_lock_bh(&cpu_queue->q_lock);

		backlog = crypto_get_backlog(&cpu_queue->queue);

		req = crypto_dequeue_request(&cpu_queue->queue);

		preempt_enable();

		local_bh_enable();

		spin_unlock_bh(&cpu_queue->q_lock);



		if (!req) {

			mcryptd_opportunistic_flush();
@@ -184,7 +181,7 @@ static void mcryptd_queue_worker(struct work_struct *work) 
		++i;

	}

	if (cpu_queue->queue.qlen)

		queue_work(kcrypto_wq, &cpu_queue->work);

		queue_work_on(smp_processor_id(), kcrypto_wq, &cpu_queue->work);

}



void mcryptd_flusher(struct work_struct *__work)