The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/813a7d3099c773023edd69e9aa4b04520f3df482

commit 813a7d3099c773023edd69e9aa4b04520f3df482
Author: Guenter Roeck <groeck@chromium.org>
Date: Tue Jan 23 20:10:56 2018

CHROMIUM: Merge 'v4.14.15' into chromeos-4.14

Merge of v4.14.15 into chromeos-4.14

Changelog:
----------------------------------------------------------------
Alexey Dobriyan (1):
      proc: fix coredump vs read /proc/*/stat race

Andi Kleen (3):
      module: Add retpoline tag to VERMAGIC
      x86/idt: Mark IDT tables __initconst
      x86/retpoline: Optimize inline assembler for vmexit_fill_RSB

Andrew Morton (1):
      tools/objtool/Makefile: don't assume sync-check.sh is executable

Andrey Ryabinin (1):
      x86/kasan: Panic if there is not enough memory to boot

Arnd Bergmann (1):
      phy: work around 'phys' references to usb-nop-xceiv devices

Benoît Thébaudeau (1):
      mmc: sdhci-esdhc-imx: Fix i.MX53 eSDHCv3 clock

Dan Carpenter (1):
      IB/hfi1: Prevent a NULL dereference

David Woodhouse (1):
      x86/retpoline: Fill RSB on context switch for affected CPUs

Dennis Yang (1):
      dm thin metadata: THIN_MAX_CONCURRENT_LOCKS should be 6

Eric Biggers (2):
      af_key: fix buffer overread in verify_address_len()
      af_key: fix buffer overread in parse_exthdrs()

Eric W. Biederman (1):
      x86/mm/pkeys: Fix fill_sig_info_pkey

Greg Kroah-Hartman (1):
      Linux 4.14.15

Gregory CLEMENT (1):
      ARM64: dts: marvell: armada-cp110: Fix clock resources for various node

Guenter Roeck (1):
      Merge remote-tracking branch 'origin/linux/v4.14.15' into merge/chromeos-4.14-v4.14.15

Hannes Reinecke (1):
      scsi: libsas: Disable asynchronous aborts for SATA devices

James Hogan (1):
      MIPS: CM: Drop WARN_ON(vp != 0)

Jeremy Compostella (1):
      i2c: core-smbus: prevent stack corruption on read I2C_BLOCK_DATA

Joe Lawrence (1):
      pipe: avoid round_pipe_size() nr_pages overflow on 32-bit

Joe Thornber (1):
      dm btree: fix serious bug in btree_split_beneath()

Johan Hovold (3):
      Input: 88pm860x-ts - fix child-node lookup
      Input: twl6040-vibra - fix child-node lookup
      Input: twl4030-vibra - fix sibling-node lookup

Jonas Gorski (1):
      MIPS: AR7: ensure the port type's FCR value is used

Josh Poimboeuf (2):
      objtool: Fix seg fault with gold linker
      objtool: Improve error message for bad file argument

Josh Snyder (1):
      delayacct: Account blkio completion on the correct task

Kirill A. Shutemov (1):
      mm, page_vma_mapped: Drop faulty pointer arithmetics in check_pte()

Laura Abbott (1):
      x86: Use __nostackprotect for sme_encrypt_kernel

Len Brown (2):
      x86/tsc: Future-proof native_calibrate_tsc()
      x86/tsc: Fix erroneous TSC rate on Skylake Xeon

Leon Romanovsky (1):
      RDMA/mlx5: Fix out-of-bound access while querying AH

Li Jinyue (1):
      futex: Prevent overflow by strengthen input validation

Lorenzo Pieralisi (1):
      alpha/PCI: Fix noname IRQ level detection

Lukas Bulwahn (1):
      objtool: Fix Clang enum conversion warning

Marc Kleine-Budde (2):
      can: af_can: can_rcv(): replace WARN_ONCE by pr_warn_once
      can: af_can: canfd_rcv(): replace WARN_ONCE by pr_warn_once

Marc Zyngier (1):
      arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls

Masami Hiramatsu (3):
      retpoline: Introduce start/end markers of indirect thunk
      kprobes/x86: Blacklist indirect thunk functions for kprobes
      kprobes/x86: Disable optimizing on the function jumps to indirect thunk

Maxime Ripard (1):
      ARM: sunxi_defconfig: Enable CMA

Michael Ellerman (2):
      powerpc/64s: Add support for RFI flush of L1-D cache
      powerpc/64s: Support disabling RFI flush with no_rfi_flush and nopti

Michael Neuling (2):
      powerpc/pseries: Add H_GET_CPU_CHARACTERISTICS flags & wrapper
      powerpc/pseries: Query hypervisor for RFI flush settings

Mikulas Patocka (1):
      dm integrity: don't store cipher request on the stack

Milan Broz (1):
      dm crypt: fix crash by adding missing check for auth key size

Nicholas Piggin (5):
      powerpc/64: Add macros for annotating the destination of rfid/hrfid
      powerpc/64s: Simple RFI macro conversions
      powerpc/64: Convert the syscall exit path to use RFI_TO_USER/KERNEL
      powerpc/64: Convert fast_exception_return to use RFI_TO_USER/KERNEL
      powerpc/64s: Convert slb_miss_common to use RFI_TO_USER/KERNEL

Nick Desaulniers (1):
      Input: synaptics-rmi4 - prevent UAF reported by KASAN

Nir Perry (1):
      Input: ALPS - fix multi-touch decoding on SS4 plus touchpads

Oliver O'Halloran (1):
      powerpc/powernv: Check device-tree for RFI flush settings

Ondrej Kozina (1):
      dm crypt: wipe kernel key copy after IV initialization

Paolo Bonzini (1):
      x86/cpufeature: Move processor tracing out of scattered features

Peter Zijlstra (1):
      futex: Avoid violating the 10th rule of futex

Punit Agrawal (1):
      KVM: arm/arm64: Check pagesize when allocating a hugepage at Stage 2

Rob Clark (2):
      drm/nouveau/disp/gf119: add missing drive vfunc ptr
      drm/vmwgfx: fix memory corruption with legacy/sou connectors

Sagi Grimberg (1):
      iser-target: Fix possible use-after-free in connection establishment error

Sergey Senozhatsky (1):
      workqueue: avoid hard lockups in show_workqueue_state()

Simon Ser (2):
      objtool: Fix seg fault with clang-compiled objects
      objtool: Fix seg fault caused by missing parameter

Stephane Grosjean (1):
      can: peak: fix potential bug in packet fragmentation

Steven Rostedt (VMware) (1):
      tracing: Fix converting enum's from the map in trace_event_eval_update()

Takashi Iwai (4):
      ALSA: seq: Make ioctls race-free
      ALSA: pcm: Remove yet superfluous WARN_ON()
      ALSA: hda - Apply headphone noise quirk for another Dell XPS 13 variant
      ALSA: hda - Apply the existing quirk to iMac 14,1

Tero Kristo (1):
      ARM: OMAP3: hwmod_data: add missing module_offs for MMC3

Thomas Gleixner (4):
      timers: Unconditionally check deferrable base
      x86/intel_rdt/cqm: Prevent use after free
      x86/apic/vector: Fix off by one in error path
      x86/mce: Make machine check speculation protected

Thomas Petazzoni (1):
      ARM: dts: kirkwood: fix pin-muxing of MPP7 on OpenBlocks A7

Tom Lendacky (7):
      x86/retpoline: Add LFENCE to the retpoline/RSB filling RSB macros
      x86/mm: Clean up register saving in the __enc_copy() assembly code
      x86/mm: Use a struct to reduce parameters for SME PGD mapping
      x86/mm: Centralize PMD flags in sme_encrypt_kernel()
      x86/mm: Prepare sme_encrypt_kernel() for PAGE aligned encryption
      x86/mm: Encrypt the initrd earlier for BSP microcode update
      x86/mm: Rework wbinvd, hlt operation in stop_this_cpu()

Wei Yongjun (1):
      dm crypt: fix error return code in crypt_ctr()

Xi Kangjie (1):
      scripts/gdb/linux/tasks.py: fix get_thread_info

Xinyu Lin (1):
      libata: apply MAX_SEC_1024 to all LITEON EP1 series devices

Yan Markman (1):
      net: mvpp2: do not disable GMAC padding

zhenwei.pi (1):
      x86/pti: Document fix wrong index

 Documentation/x86/pti.txt                          |   2 +-
 Makefile                                           |   2 +-
 arch/alpha/kernel/sys_sio.c                        |  35 +-
 arch/arm/boot/dts/kirkwood-openblocks_a7.dts       |  10 +-
 arch/arm/configs/sunxi_defconfig                   |   2 +
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |   1 +
 .../boot/dts/marvell/armada-cp110-master.dtsi      |  13 +-
 .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi |   9 +-
 arch/arm64/kvm/handle_exit.c                       |   4 +-
 arch/mips/ar7/platform.c                           |   2 +-
 arch/mips/kernel/mips-cm.c                         |   1 -
 arch/powerpc/include/asm/exception-64e.h           |   6 +
 arch/powerpc/include/asm/exception-64s.h           |  57 +++-
 arch/powerpc/include/asm/feature-fixups.h          |  13 +
 arch/powerpc/include/asm/hvcall.h                  |  17 +
 arch/powerpc/include/asm/paca.h                    |  10 +
 arch/powerpc/include/asm/plpar_wrappers.h          |  14 +
 arch/powerpc/include/asm/setup.h                   |  13 +
 arch/powerpc/kernel/asm-offsets.c                  |   5 +
 arch/powerpc/kernel/entry_64.S                     |  44 ++-
 arch/powerpc/kernel/exceptions-64s.S               | 135 +++++++-
 arch/powerpc/kernel/setup_64.c                     | 101 ++++++
 arch/powerpc/kernel/vmlinux.lds.S                  |   9 +
 arch/powerpc/kvm/book3s_hv_rmhandlers.S            |   7 +-
 arch/powerpc/kvm/book3s_rmhandlers.S               |   7 +-
 arch/powerpc/kvm/book3s_segment.S                  |   4 +-
 arch/powerpc/lib/feature-fixups.c                  |  41 +++
 arch/powerpc/platforms/powernv/setup.c             |  49 +++
 arch/powerpc/platforms/pseries/setup.c             |  35 ++
 arch/x86/entry/entry_32.S                          |  11 +
 arch/x86/entry/entry_64.S                          |  13 +-
 arch/x86/include/asm/cpufeatures.h                 |   3 +-
 arch/x86/include/asm/mem_encrypt.h                 |   4 +-
 arch/x86/include/asm/nospec-branch.h               |  16 +-
 arch/x86/include/asm/traps.h                       |   1 +
 arch/x86/kernel/apic/vector.c                      |   7 +-
 arch/x86/kernel/cpu/bugs.c                         |  36 +++
 arch/x86/kernel/cpu/intel_rdt.c                    |   8 +-
 arch/x86/kernel/cpu/mcheck/mce.c                   |   5 +
 arch/x86/kernel/cpu/scattered.c                    |   1 -
 arch/x86/kernel/head64.c                           |   4 +-
 arch/x86/kernel/idt.c                              |  12 +-
 arch/x86/kernel/kprobes/opt.c                      |  23 +-
 arch/x86/kernel/process.c                          |  25 +-
 arch/x86/kernel/setup.c                            |   8 -
 arch/x86/kernel/tsc.c                              |   3 +-
 arch/x86/kernel/vmlinux.lds.S                      |   6 +
 arch/x86/lib/retpoline.S                           |   5 +-
 arch/x86/mm/fault.c                                |   7 +-
 arch/x86/mm/kasan_init_64.c                        |  24 +-
 arch/x86/mm/mem_encrypt.c                          | 356 +++++++++++++++------
 arch/x86/mm/mem_encrypt_boot.S                     |  80 ++---
 drivers/ata/libata-core.c                          |   1 +
 .../gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c    |   1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c                |   4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c               |   4 +-
 drivers/i2c/i2c-core-smbus.c                       |  13 +-
 drivers/infiniband/hw/hfi1/file_ops.c              |   4 +-
 drivers/infiniband/hw/mlx5/qp.c                    |   7 +-
 drivers/infiniband/ulp/isert/ib_isert.c            |   1 +
 drivers/input/misc/twl4030-vibra.c                 |   6 +-
 drivers/input/misc/twl6040-vibra.c                 |   3 +-
 drivers/input/mouse/alps.c                         |  23 +-
 drivers/input/mouse/alps.h                         |  10 +-
 drivers/input/rmi4/rmi_driver.c                    |   4 +-
 drivers/input/touchscreen/88pm860x-ts.c            |  16 +-
 drivers/md/dm-crypt.c                              |  20 +-
 drivers/md/dm-integrity.c                          |  49 ++-
 drivers/md/dm-thin-metadata.c                      |   6 +-
 drivers/md/persistent-data/dm-btree.c              |  19 +-
 drivers/mmc/host/sdhci-esdhc-imx.c                 |  14 +
 drivers/net/can/usb/peak_usb/pcan_usb_fd.c         |  21 +-
 drivers/net/ethernet/marvell/mvpp2.c               |   9 -
 drivers/phy/phy-core.c                             |   4 +
 drivers/scsi/libsas/sas_scsi_host.c                |  17 +-
 fs/pipe.c                                          |  17 +-
 fs/proc/array.c                                    |   7 +-
 include/linux/delayacct.h                          |   8 +-
 include/linux/swapops.h                            |  21 ++
 include/linux/vermagic.h                           |   8 +-
 kernel/delayacct.c                                 |  42 ++-
 kernel/futex.c                                     |  86 ++++-
 kernel/locking/rtmutex.c                           |  26 +-
 kernel/locking/rtmutex_common.h                    |   1 +
 kernel/sched/core.c                                |   6 +-
 kernel/time/timer.c                                |   2 +-
 kernel/trace/trace_events.c                        |  16 +-
 kernel/workqueue.c                                 |  13 +
 mm/page_vma_mapped.c                               |  63 ++--
 net/can/af_can.c                                   |  36 +--
 net/key/af_key.c                                   |   8 +
 scripts/Makefile.build                             |  14 +-
 scripts/gdb/linux/tasks.py                         |   2 +
 sound/core/pcm_lib.c                               |   1 -
 sound/core/seq/seq_clientmgr.c                     |   3 +
 sound/core/seq/seq_clientmgr.h                     |   1 +
 sound/pci/hda/patch_cirrus.c                       |   1 +
 sound/pci/hda/patch_realtek.c                      |   1 +
 tools/objtool/Makefile                             |   2 +-
 tools/objtool/arch/x86/decode.c                    |   2 +-
 tools/objtool/builtin-orc.c                        |   4 +-
 tools/objtool/elf.c                                |   4 +-
 tools/objtool/orc_gen.c                            |   2 +
 virt/kvm/arm/mmu.c                                 |   2 +-
 104 files changed, 1514 insertions(+), 447 deletions(-)

BUG= chromium:804998 
TEST=Build and test on various affected systems

Change-Id: I197f644bde12146f4de0cd76304bbd5bc5ba987e
Signed-off-by: Guenter Roeck <groeck@chromium.org>