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

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

Merge 3.18.91 into android-3.18 



Changes in 3.18.91
	ACPI: APEI / ERST: Fix missing error handling in erst_reader()
	crypto: mcryptd - protect the per-CPU queue with a lock
	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: 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
	KVM: X86: Fix load RFLAGS w/o the fixed bit
	powerpc/perf: Dereference BHRB entries safely
	net: mvneta: clear interface link status on port disable
	tracing: Remove extra zeroing out of the ring buffer page
	tracing: Fix possible double free on failure of allocating trace buffer
	tracing: Fix crash when it fails to alloc ring buffer
	ring-buffer: Mask out the info bits when returning buffer page length
	ASoC: twl4030: fix child-node lookup
	kbuild: add '-fno-stack-check' to kernel build options
	ipv4: igmp: guard against silly MTU values
	ipv6: mcast: better catch silly mtu values
	net: igmp: Use correct source address on IGMPv3 reports
	netlink: Add netns check on taps
	net: qmi_wwan: add Sierra EM7565 1199:9091
	tcp md5sig: Use skb's saddr when replying to an incoming segment
	tg3: Fix rx hang on MTU change with 5717/5719
	net: mvmdio: disable/unprepare clocks in EPROBE_DEFER case
	sctp: Replace use of sockets_allocated with specified macro.
	net: ipv4: fix for a race condition in raw_sendmsg
	USB: serial: option: add support for Telit ME910 PID 0x1101
	usb: Add device quirk for Logitech HD Pro Webcam C925e
	usb: add RESET_RESUME for ELSA MicroLink 56K
	usb: xhci: Add XHCI_TRUST_TX_LENGTH for Renesas uPD720201
	n_tty: fix EXTPROC vs ICANON interaction with TIOCINQ (aka FIONREAD)
	Linux 3.18.91

Change-Id: I64c5bd6d9812db482f230aed397d4b62027f26c7
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 98ff7973 788ccf75

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 90

SUBLEVEL = 91

EXTRAVERSION =

NAME = Diseased Newt
@@ -771,6 +771,9 @@ KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign) 
# disable invalid "can't wrap" optimizations for signed / pointers

KBUILD_CFLAGS	+= $(call cc-option,-fno-strict-overflow)



# Make sure -fstack-check isn't enabled (like gentoo apparently did)

KBUILD_CFLAGS  += $(call cc-option,-fno-stack-check,)



# conserve stack if available

KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)

arch/powerpc/perf/core-book3s.c

+6 −2
Original line number Diff line number Diff line
@@ -396,8 +396,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/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -6644,7 +6644,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;

}
@@ -164,16 +166,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();
@@ -188,7 +185,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)

drivers/acpi/apei/erst.c

+1 −1
Original line number Diff line number Diff line
@@ -1023,7 +1023,7 @@ skip: 
	/* The record may be cleared by others, try read next record */

	if (len == -ENOENT)

		goto skip;

	else if (len < sizeof(*rcd)) {

	else if (len < 0 || len < sizeof(*rcd)) {

		rc = -EIO;

		goto out;

	}