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

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

Merge 3.18.100 into android-3.18 



Changes in 3.18.100
	scsi: qla2xxx: Fix NULL pointer crash due to active timer for ABTS
	MIPS: BMIPS: Do not mask IPIs during suspend
	Input: matrix_keypad - fix race when disabling interrupts
	x86/MCE: Serialize sysfs changes
	ALSA: seq: Don't allow resizing pool in use
	ALSA: seq: More protection for concurrent write and ioctl races
	netfilter: x_tables: fix missing timer initialization in xt_LED
	netfilter: nat: cope with negative port range
	netfilter: IDLETIMER: be syzkaller friendly
	netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsets
	netfilter: bridge: ebt_among: add missing match size checks
	netfilter: ipv6: fix use-after-free Write in nf_nat_ipv6_manip_pkt
	ubi: Fix race condition between ubi volume creation and udev
	scripts: recordmcount: break hardlinks
	x86/module: Detect and skip invalid relocations
	x86: Treat R_X86_64_PLT32 as R_X86_64_PC32
	serial: sh-sci: prevent lockup on full TTY buffers
	tty/serial: atmel: add new version check for usart
	uas: fix comparison for error code
	staging: android: ashmem: Fix lockdep issue during llseek
	usb: quirks: add control message delay for 1b1c:1b20
	USB: usbmon: remove assignment from IS_ERR argument
	usb: usbmon: Read text within supplied buffer size
	serial: 8250_pci: Add Brainboxes UC-260 4 port serial device
	fixup: sctp: verify size of a new chunk in _sctp_make_chunk()
	Linux 3.18.100

Change-Id: I50f9619814561292ffd074188ea298a8ebbb1c8a
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents cfcdd3d4 5fcd9374

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 99

SUBLEVEL = 100

EXTRAVERSION =

NAME = Diseased Newt

arch/mips/kernel/smp-bmips.c

+4 −4
Original line number Diff line number Diff line
@@ -159,11 +159,11 @@ static void bmips_prepare_cpus(unsigned int max_cpus) 
		return;

	}



	if (request_irq(IPI0_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,

			"smp_ipi0", NULL))

	if (request_irq(IPI0_IRQ, bmips_ipi_interrupt,

			IRQF_PERCPU | IRQF_NO_SUSPEND, "smp_ipi0", NULL))

		panic("Can't request IPI0 interrupt");

	if (request_irq(IPI1_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,

			"smp_ipi1", NULL))

	if (request_irq(IPI1_IRQ, bmips_ipi_interrupt,

			IRQF_PERCPU | IRQF_NO_SUSPEND, "smp_ipi1", NULL))

		panic("Can't request IPI1 interrupt");

}

arch/x86/kernel/cpu/mcheck/mce.c

+21 −1
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ static DEFINE_MUTEX(mce_chrdev_read_mutex); 
			      rcu_read_lock_sched_held() || \

			      lockdep_is_held(&mce_chrdev_read_mutex))



/* sysfs synchronization */

static DEFINE_MUTEX(mce_sysfs_mutex);



#define CREATE_TRACE_POINTS

#include <trace/events/mce.h>
@@ -2183,6 +2186,7 @@ static ssize_t set_ignore_ce(struct device *s, 
	if (kstrtou64(buf, 0, &new) < 0)

		return -EINVAL;



	mutex_lock(&mce_sysfs_mutex);

	if (mca_cfg.ignore_ce ^ !!new) {

		if (new) {

			/* disable ce features */
@@ -2195,6 +2199,8 @@ static ssize_t set_ignore_ce(struct device *s, 
			on_each_cpu(mce_enable_ce, (void *)1, 1);

		}

	}

	mutex_unlock(&mce_sysfs_mutex);



	return size;

}
@@ -2207,6 +2213,7 @@ static ssize_t set_cmci_disabled(struct device *s, 
	if (kstrtou64(buf, 0, &new) < 0)

		return -EINVAL;



	mutex_lock(&mce_sysfs_mutex);

	if (mca_cfg.cmci_disabled ^ !!new) {

		if (new) {

			/* disable cmci */
@@ -2218,6 +2225,8 @@ static ssize_t set_cmci_disabled(struct device *s, 
			on_each_cpu(mce_enable_ce, NULL, 1);

		}

	}

	mutex_unlock(&mce_sysfs_mutex);



	return size;

}
@@ -2225,8 +2234,19 @@ static ssize_t store_int_with_restart(struct device *s, 
				      struct device_attribute *attr,

				      const char *buf, size_t size)

{

	ssize_t ret = device_store_int(s, attr, buf, size);

	unsigned long old_check_interval = check_interval;

	ssize_t ret = device_store_ulong(s, attr, buf, size);



	if (check_interval == old_check_interval)

		return ret;



	if (check_interval < 1)

		check_interval = 1;



	mutex_lock(&mce_sysfs_mutex);

	mce_restart();

	mutex_unlock(&mce_sysfs_mutex);



	return ret;

}

arch/x86/kernel/machine_kexec_64.c

+1 −0
Original line number Diff line number Diff line
@@ -516,6 +516,7 @@ int arch_kexec_apply_relocations_add(const Elf64_Ehdr *ehdr, 
				goto overflow;

			break;

		case R_X86_64_PC32:

		case R_X86_64_PLT32:

			value -= (u64)address;

			*(u32 *)location = value;

			break;

arch/x86/kernel/module.c

+14 −0
Original line number Diff line number Diff line
@@ -167,19 +167,28 @@ int apply_relocate_add(Elf64_Shdr *sechdrs, 
		case R_X86_64_NONE:

			break;

		case R_X86_64_64:

			if (*(u64 *)loc != 0)

				goto invalid_relocation;

			*(u64 *)loc = val;

			break;

		case R_X86_64_32:

			if (*(u32 *)loc != 0)

				goto invalid_relocation;

			*(u32 *)loc = val;

			if (val != *(u32 *)loc)

				goto overflow;

			break;

		case R_X86_64_32S:

			if (*(s32 *)loc != 0)

				goto invalid_relocation;

			*(s32 *)loc = val;

			if ((s64)val != *(s32 *)loc)

				goto overflow;

			break;

		case R_X86_64_PC32:

		case R_X86_64_PLT32:

			if (*(u32 *)loc != 0)

				goto invalid_relocation;

			val -= (u64)loc;

			*(u32 *)loc = val;

#if 0
@@ -195,6 +204,11 @@ int apply_relocate_add(Elf64_Shdr *sechdrs, 
	}

	return 0;



invalid_relocation:

	pr_err("x86/modules: Skipping invalid relocation target, existing value is nonzero for type %d, loc %p, val %Lx\n",

	       (int)ELF64_R_TYPE(rel[i].r_info), loc, val);

	return -ENOEXEC;



overflow:

	pr_err("overflow in relocation type %d val %Lx\n",

	       (int)ELF64_R_TYPE(rel[i].r_info), val);