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

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

Merge 4.9.85 into android-4.9 



Changes in 4.9.85
	netfilter: drop outermost socket lock in getsockopt()
	xtensa: fix high memory/reserved memory collision
	scsi: ibmvfc: fix misdefined reserved field in ibmvfc_fcp_rsp_info
	cfg80211: fix cfg80211_beacon_dup
	X.509: fix BUG_ON() when hash algorithm is unsupported
	PKCS#7: fix certificate chain verification
	RDMA/uverbs: Protect from command mask overflow
	iio: buffer: check if a buffer has been set up when poll is called
	iio: adis_lib: Initialize trigger before requesting interrupt
	x86/oprofile: Fix bogus GCC-8 warning in nmi_setup()
	irqchip/gic-v3: Use wmb() instead of smb_wmb() in gic_raise_softirq()
	PCI/cxgb4: Extend T3 PCI quirk to T4+ devices
	ohci-hcd: Fix race condition caused by ohci_urb_enqueue() and io_watchdog_func()
	usb: ohci: Proper handling of ed_rm_list to handle race condition between usb_kill_urb() and finish_unlinks()
	arm64: Disable unhandled signal log messages by default
	Add delay-init quirk for Corsair K70 RGB keyboards
	drm/edid: Add 6 bpc quirk for CPT panel in Asus UX303LA
	usb: dwc3: gadget: Set maxpacket size for ep0 IN
	usb: ldusb: add PIDs for new CASSY devices supported by this driver
	Revert "usb: musb: host: don't start next rx urb if current one failed"
	usb: gadget: f_fs: Process all descriptors during bind
	usb: renesas_usbhs: missed the "running" flag in usb_dmac with rx path
	drm/amdgpu: Add dpm quirk for Jet PRO (v2)
	drm/amdgpu: add atpx quirk handling (v2)
	drm/amdgpu: Avoid leaking PM domain on driver unbind (v2)
	drm/amdgpu: add new device to use atpx quirk
	binder: add missing binder_unlock()
	X.509: fix NULL dereference when restricting key with unsupported_sig
	mm: avoid spurious 'bad pmd' warning messages
	fs/dax.c: fix inefficiency in dax_writeback_mapping_range()
	libnvdimm: fix integer overflow static analysis warning
	device-dax: implement ->split() to catch invalid munmap attempts
	mm: introduce get_user_pages_longterm
	v4l2: disable filesystem-dax mapping support
	IB/core: disable memory registration of filesystem-dax vmas
	libnvdimm, dax: fix 1GB-aligned namespaces vs physical misalignment
	mm: Fix devm_memremap_pages() collision handling
	mm: fail get_vaddr_frames() for filesystem-dax mappings
	x86/entry/64: Clear extra registers beyond syscall arguments, to reduce speculation attack surface
	Linux 4.9.85

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

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 84

SUBLEVEL = 85

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm64/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static const char *handler[]= { 
	"Error"

};



int show_unhandled_signals = 1;

int show_unhandled_signals = 0;



/*

 * Dump out the contents of some kernel memory nicely...

arch/x86/entry/entry_64.S

+13 −0
Original line number Diff line number Diff line
@@ -176,13 +176,26 @@ GLOBAL(entry_SYSCALL_64_after_swapgs) 
	pushq	%r8				/* pt_regs->r8 */

	pushq	%r9				/* pt_regs->r9 */

	pushq	%r10				/* pt_regs->r10 */

	/*

	 * Clear extra registers that a speculation attack might

	 * otherwise want to exploit. Interleave XOR with PUSH

	 * for better uop scheduling:

	 */

	xorq	%r10, %r10			/* nospec   r10 */

	pushq	%r11				/* pt_regs->r11 */

	xorq	%r11, %r11			/* nospec   r11 */

	pushq	%rbx				/* pt_regs->rbx */

	xorl	%ebx, %ebx			/* nospec   rbx */

	pushq	%rbp				/* pt_regs->rbp */

	xorl	%ebp, %ebp			/* nospec   rbp */

	pushq	%r12				/* pt_regs->r12 */

	xorq	%r12, %r12			/* nospec   r12 */

	pushq	%r13				/* pt_regs->r13 */

	xorq	%r13, %r13			/* nospec   r13 */

	pushq	%r14				/* pt_regs->r14 */

	xorq	%r14, %r14			/* nospec   r14 */

	pushq	%r15				/* pt_regs->r15 */

	xorq	%r15, %r15			/* nospec   r15 */



	/* IRQs are off. */

	movq	%rsp, %rdi

arch/x86/oprofile/nmi_int.c

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ static int nmi_setup(void) 
		goto fail;



	for_each_possible_cpu(cpu) {

		if (!cpu)

		if (!IS_ENABLED(CONFIG_SMP) || !cpu)

			continue;



		memcpy(per_cpu(cpu_msrs, cpu).counters,

arch/xtensa/mm/init.c

+63 −7
Original line number Diff line number Diff line
@@ -77,19 +77,75 @@ void __init zones_init(void) 
	free_area_init_node(0, zones_size, ARCH_PFN_OFFSET, NULL);

}



#ifdef CONFIG_HIGHMEM

static void __init free_area_high(unsigned long pfn, unsigned long end)

{

	for (; pfn < end; pfn++)

		free_highmem_page(pfn_to_page(pfn));

}



static void __init free_highpages(void)

{

	unsigned long max_low = max_low_pfn;

	struct memblock_region *mem, *res;



	reset_all_zones_managed_pages();

	/* set highmem page free */

	for_each_memblock(memory, mem) {

		unsigned long start = memblock_region_memory_base_pfn(mem);

		unsigned long end = memblock_region_memory_end_pfn(mem);



		/* Ignore complete lowmem entries */

		if (end <= max_low)

			continue;



		if (memblock_is_nomap(mem))

			continue;



		/* Truncate partial highmem entries */

		if (start < max_low)

			start = max_low;



		/* Find and exclude any reserved regions */

		for_each_memblock(reserved, res) {

			unsigned long res_start, res_end;



			res_start = memblock_region_reserved_base_pfn(res);

			res_end = memblock_region_reserved_end_pfn(res);



			if (res_end < start)

				continue;

			if (res_start < start)

				res_start = start;

			if (res_start > end)

				res_start = end;

			if (res_end > end)

				res_end = end;

			if (res_start != start)

				free_area_high(start, res_start);

			start = res_end;

			if (start == end)

				break;

		}



		/* And now free anything which remains */

		if (start < end)

			free_area_high(start, end);

	}

}

#else

static void __init free_highpages(void)

{

}

#endif



/*

 * Initialize memory pages.

 */



void __init mem_init(void)

{

#ifdef CONFIG_HIGHMEM

	unsigned long tmp;



	reset_all_zones_managed_pages();

	for (tmp = max_low_pfn; tmp < max_pfn; tmp++)

		free_highmem_page(pfn_to_page(tmp));

#endif

	free_highpages();



	max_mapnr = max_pfn - ARCH_PFN_OFFSET;

	high_memory = (void *)__va(max_low_pfn << PAGE_SHIFT);