Commit 4777f6d2 authored Oct 30, 2017 by Kyle Yan

Merge remote-tracking branch '4.9/tmp-0c058ce1' into 4.9



* 4.9/tmp-0c058ce1:
  Linux 4.9.59
  FS-Cache: fix dereference of NULL user_key_payload
  KEYS: Fix race between updating and finding a negative key
  fscrypt: fix dereference of NULL user_key_payload
  xfs: trim writepage mapping to within eof
  xfs: cancel dirty pages on invalidation
  xfs: handle error if xfs_btree_get_bufs fails
  xfs: reinit btree pointer on attr tree inactivation walk
  xfs: don't change inode mode if ACL update fails
  xfs: move more RT specific code under CONFIG_XFS_RT
  xfs: Don't log uninitialised fields in inode structures
  xfs: handle racy AIO in xfs_reflink_end_cow
  xfs: always swap the cow forks when swapping extents
  xfs: Capture state of the right inode in xfs_iflush_done
  xfs: perag initialization should only touch m_ag_max_usable for AG 0
  xfs: update i_size after unwritten conversion in dio completion
  xfs: report zeroed or not correctly in xfs_zero_range()
  fs/xfs: Use %pS printk format for direct addresses
  xfs: evict CoW fork extents when performing finsert/fcollapse
  xfs: don't unconditionally clear the reflink flag on zero-block files
  vmbus: fix missing signaling in hv_signal_on_read()
  pkcs7: Prevent NULL pointer dereference, since sinfo is not always set.
  KEYS: don't let add_key() update an uninstantiated key
  lib/digsig: fix dereference of NULL user_key_payload
  KEYS: encrypted: fix dereference of NULL user_key_payload
  x86/microcode/intel: Disable late loading on model 79
  rtlwifi: rtl8821ae: Fix connection lost problem
  clockevents/drivers/cs5535: Improve resilience to spurious interrupts
  bus: mbus: fix window size calculation for 4GB windows
  brcmsmac: make some local variables 'static const' to reduce stack size
  brcmfmac: Add check for short event packets
  i2c: piix4: Fix SMBus port selection for AMD Family 17h chips
  i2c: ismt: Separate I2C block read from SMBus block read
  ALSA: hda: Abort capability probe at invalid register read
  ALSA: hda: Remove superfluous '-' added by printk conversion
  ALSA: seq: Enable 'use' locking in all configurations
  drm/nouveau/mmu: flush tlbs before deleting page tables
  drm/nouveau/bsp/g92: disable by default
  can: esd_usb2: Fix can_dlc value for received RTR, frames
  xhci: Identify USB 3.1 capable hosts by their port protocol capability
  usb: musb: Check for host-mode using is_host_active() on reset interrupt
  usb: musb: sunxi: Explicitly release USB PHY on exit
  iio: dummy: events: Add missing break
  parisc: Fix double-word compare and exchange in LWS code on 32-bit kernels
  can: gs_usb: fix busy loop if no more TX context is available
  ALSA: usb-audio: Add native DSD support for Pro-Ject Pre Box S2 Digital
  usb: hub: Allow reset retry for USB2 devices on connect bounce
  usb: quirks: add quirk for WORLDE MINI MIDI keyboard
  usb: cdc_acm: Add quirk for Elatec TWN3
  USB: serial: metro-usb: add MS7820 device id
  USB: core: fix out-of-bounds access bug in usb_get_bos_descriptor()
  USB: devio: Revert "USB: devio: Don't corrupt user memory"

Conflicts:
	fs/xfs/xfs_acl.c

Change-Id: Ib161b10e193ec68faa41c61a64d5d677ef3bc9c4
Signed-off-by: Kyle Yan <kyan@codeaurora.org>

parents ebac0555 0c058ce1

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 58
		SUBLEVEL = 59
		EXTRAVERSION =
		NAME = Roaring Lionus

arch/parisc/kernel/syscall.S

+3 −3

Original line number	Diff line number	Diff line
		@@ -742,7 +742,7 @@ lws_compare_and_swap_2:
		10: ldd 0(%r25), %r25
		11: ldd 0(%r24), %r24
		#else
		/* Load new value into r22/r23 - high/low */
		/* Load old value into r22/r23 - high/low */
		10: ldw 0(%r25), %r22
		11: ldw 4(%r25), %r23
		/* Load new value into fr4 for atomic store later */
		@@ -834,11 +834,11 @@ cas2_action:
		copy %r0, %r28
		#else
		/* Compare first word */
		19: ldw,ma 0(%r26), %r29
		19: ldw 0(%r26), %r29
		sub,= %r29, %r22, %r0
		b,n cas2_end
		/* Compare second word */
		20: ldw,ma 4(%r26), %r29
		20: ldw 4(%r26), %r29
		sub,= %r29, %r23, %r0
		b,n cas2_end
		/* Perform the store */

arch/x86/kernel/cpu/microcode/intel.c

+19 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@
		#include <linux/mm.h>

		#include <asm/microcode_intel.h>
		#include <asm/intel-family.h>
		#include <asm/processor.h>
		#include <asm/tlbflush.h>
		#include <asm/setup.h>
		@@ -1046,6 +1047,18 @@ static int get_ucode_fw(void to, const void from, size_t n)
		return 0;
		}

		static bool is_blacklisted(unsigned int cpu)
		{
		struct cpuinfo_x86 *c = &cpu_data(cpu);

		if (c->x86 == 6 && c->x86_model == INTEL_FAM6_BROADWELL_X) {
		pr_err_once("late loading on model 79 is disabled.\n");
		return true;
		}

		return false;
		}

		static enum ucode_state request_microcode_fw(int cpu, struct device *device,
		bool refresh_fw)
		{
		@@ -1054,6 +1067,9 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
		const struct firmware *firmware;
		enum ucode_state ret;

		if (is_blacklisted(cpu))
		return UCODE_NFOUND;

		sprintf(name, "intel-ucode/%02x-%02x-%02x",
		c->x86, c->x86_model, c->x86_mask);

		@@ -1078,6 +1094,9 @@ static int get_ucode_user(void to, const void from, size_t n)
		static enum ucode_state
		request_microcode_user(int cpu, const void __user *buf, size_t size)
		{
		if (is_blacklisted(cpu))
		return UCODE_NFOUND;

		return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
		}

crypto/asymmetric_keys/pkcs7_parser.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,9 @@ static int pkcs7_check_authattrs(struct pkcs7_message *msg)
		bool want = false;

		sinfo = msg->signed_infos;
		if (!sinfo)
		goto inconsistent;

		if (sinfo->authattrs) {
		want = true;
		msg->have_authattrs = true;

drivers/bus/mvebu-mbus.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -720,7 +720,7 @@ mvebu_mbus_default_setup_cpu_target(struct mvebu_mbus_state *mbus)
		if (mbus->hw_io_coherency)
		w->mbus_attr \|= ATTR_HW_COHERENCY;
		w->base = base & DDR_BASE_CS_LOW_MASK;
		w->size = (size \| ~DDR_SIZE_MASK) + 1;
		w->size = (u64)(size \| ~DDR_SIZE_MASK) + 1;
		}
		}
		mvebu_mbus_dram_info.num_cs = cs;