New issue
Advanced search Search tips

Issue 807762 link

Starred by 3 users

Issue metadata

Status: Fixed
Owner:
Closed: Feb 2018
Components:
EstimatedDays: ----
NextAction: ----
OS: Chrome
Pri: 3
Type: Bug



Sign in to add a comment

Merge v4.4.114 into chromeos-4.4

Project Member Reported by groeck@chromium.org, Jan 31 2018

Issue description

Merge upstream release v4.4.114 into chromeos-4.4

 
Project Member

Comment 1 by bugdroid1@chromium.org, Feb 4 2018

Labels: merge-merged-chromeos-4.4
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/df5935f932b9fb9454074c0e5e1b0a5c21098ae1

commit df5935f932b9fb9454074c0e5e1b0a5c21098ae1
Author: Guenter Roeck <groeck@chromium.org>
Date: Thu Feb 01 15:37:32 2018

CHROMIUM: Merge 'v4.4.114' into chromeos-4.4

Merge of v4.4.114 into chromeos-4.4

Changes applied on top of 'v4.4.114' prior to merge:
    0fc47cae5870 CHROMIUM: Revert "netfilter: fix IS_ERR_VALUE usage"

Changelog:
----------------------------------------------------------------
Aaron Ma (1):
      Input: trackpoint - force 3 buttons if 0 button is reported

Alexey Kodanev (1):
      dccp: don't restart ccid2_hc_tx_rto_expire() if sk in closed state

Andrew Goodbody (1):
      usb: usbip: Fix possible deadlocks reported by lockdep

Andy Lutomirski (1):
      x86/asm/32: Make sync_core() handle missing CPUID on all 32-bit kernels

Ben Hutchings (4):
      x86/microcode/intel: Fix BDW late-loading revision check
      vsyscall: Fix permissions for emulate mode with KAISER/PTI
      ipv6: Fix getsockopt() for sockets with default IPV6_AUTOFLOWLABEL
      nfsd: auth: Fix gid sorting when rootsquash enabled

Craig Gallek (1):
      tcp: __tcp_hdrlen() helper

Dan Streetman (1):
      net: tcp: close sock if net namespace is exiting

Daniel Bristot de Oliveira (1):
      sched/deadline: Use the revised wakeup rule for suspending constrained dl tasks

Dave Hansen (1):
      x86/cpu/intel: Introduce macros for Intel family numbers

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

Doug Berger (1):
      cma: fix calculation of aligned offset

Eric Biggers (1):
      PM / sleep: declare __tracedata symbols as char[] rather than char

Eric Dumazet (3):
      ipv6: ip6_make_skb() needs to clear cork.base.dst
      net: qdisc_pkt_len_init() should be more robust
      flow_dissector: properly cap thoff field

Felix Fietkau (1):
      net: igmp: fix source address check for IGMPv3 reports

Florian Westphal (2):
      netfilter: x_tables: speed up jump target validation
      netfilter: restart search if moved to other chain

Francois Romieu (1):
      r8169: fix memory corruption on retrieval of hardware statistics.

Greg KH (1):
      eventpoll.h: add missing epoll event masks

Greg Kroah-Hartman (2):
      Revert "module: Add retpoline tag to VERMAGIC"
      Linux 4.4.114

Guenter Roeck (2):
      CHROMIUM: Revert "netfilter: fix IS_ERR_VALUE usage"
      Merge remote-tracking branch 'origin/linux/v4.4.114' into merge/chromeos-4.4-v4.4.114

Guillaume Nault (1):
      pppoe: take ->needed_headroom of lower device into account on xmit

Hongxu Jia (1):
      netfilter: arp_tables: fix invoking 32bit "iptable -P INPUT ACCEPT" failed in 64bit kernel

Jan Kara (2):
      ext2: Don't clear SGID when inheriting ACLs
      reiserfs: Don't clear SGID when inheriting ACLs

Janakarajan Natarajan (1):
      Prevent timer value 0 for MWAITX

Jeff Mahoney (2):
      reiserfs: fix race in prealloc discard
      reiserfs: don't preallocate blocks for extended attributes

Jia Zhang (1):
      x86/microcode/intel: Extend BDW late-loading further with LLC size check

Jim Westfall (2):
      net: Allow neigh contructor functions ability to modify the primary_key
      ipv4: Make neigh lookup keys for loopback/point-to-point devices be INADDR_ANY

Jiri Slaby (2):
      ipc: msg, make msgrcv work with LONG_MIN
      fs/fcntl: f_setown, avoid undefined behaviour

Johannes Thumshirn (1):
      scsi: libiscsi: fix shifting of DID_REQUEUE host byte

Jonathan Dieter (2):
      usbip: Fix implicit fallthrough warning
      usbip: Fix potential format overflow in userspace tools

Kevin Cernekee (2):
      netfilter: nfnetlink_cthelper: Add missing permission checks
      netfilter: xt_osf: Add missing permission checks

Liping Zhang (2):
      netfilter: nf_ct_expect: remove the redundant slash when policy name is empty
      netfilter: nfnetlink_queue: reject verdict request from different portid

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

Michal Hocko (2):
      mm/mmap.c: do not blow on PROT_NONE MAP_FIXED holes in the stack
      hwpoison, memcg: forcibly uncharge LRU pages

Mike Maloney (1):
      ipv6: fix udpv6 sendmsg crash caused by too small MTU

Minghuan Lian (1):
      PCI: layerscape: Fix MSG TLP drop setting

Neil Horman (1):
      vmxnet3: repair memory leak

Pablo Neira Ayuso (1):
      netfilter: fix IS_ERR_VALUE usage

Paolo Abeni (1):
      netfilter: nf_dup_ipv6: set again FLOWI_FLAG_KNOWN_NH at flowi6_flags

Pau Espin Pedrol (1):
      netfilter: use fwmark_reflect in nf_send_reset

Rafael J. Wysocki (2):
      ACPI / processor: Avoid reserving IO regions too early
      ACPI / scan: Prefer devices without _HID/_CID for _ADR matching

Rui Wang (1):
      x86/ioapic: Fix incorrect pointers in ioapic_setup_resources()

Seunghun Han (1):
      ACPICA: Namespace: fix operand cache leak

Shuah Khan (4):
      usbip: prevent vhci_hcd driver from leaking a socket pointer address
      usbip: fix stub_rx: get_pipe() to validate endpoint number
      usbip: fix stub_rx: harden CMD_SUBMIT path to handle malicious input
      usbip: prevent leaking socket pointer address in messages

Sudeep Holla (2):
      drivers: base: cacheinfo: fix x86 with CONFIG_OF enabled
      drivers: base: cacheinfo: fix boot error message when acpi is enabled

Thomas Gleixner (2):
      timers: Plug locking race vs. timer migration
      hrtimer: Reset hrtimer cpu base proper on CPU hotplug

Thomas Meyer (1):
      um: link vmlinux with -no-pie

Ulrich Weber (1):
      netfilter: nf_conntrack_sip: extend request line validation

Vegard Nossum (1):
      time: Avoid undefined behaviour in ktime_add_safe()

Vlastimil Babka (2):
      fs/select: add vmalloc fallback for select(2)
      mm, page_alloc: fix potential false positive in __zone_watermark_ok

Xin Long (2):
      sctp: do not allow the v4 socket to bind a v4mapped v6 address
      sctp: return error if the asoc has been peeled off in sctp_wait_for_sndbuf

Yang Shi (1):
      PCI: layerscape: Add "fsl,ls2085a-pcie" compatible ID

Yuiko Oshino (1):
      lan78xx: Fix failure in USB Full Speed

yangbo lu (1):
      mmc: sdhci-of-esdhc: add/remove some quirks according to vendor version

 Makefile                                   |  2 +-
 arch/um/Makefile                           |  2 +-
 arch/x86/entry/vsyscall/vsyscall_64.c      |  7 ++-
 arch/x86/include/asm/cpufeature.h          |  1 +
 arch/x86/include/asm/processor.h           |  2 +-
 arch/x86/include/asm/switch_to.h           | 38 ++++++++++++
 arch/x86/include/asm/vsyscall.h            |  1 +
 arch/x86/kernel/apic/io_apic.c             |  2 +-
 arch/x86/kernel/cpu/bugs.c                 | 36 +++++++++++
 arch/x86/kernel/cpu/intel_cacheinfo.c      |  2 +
 arch/x86/kernel/cpu/microcode/intel.c      | 21 ++++++-
 arch/x86/lib/delay.c                       |  7 +++
 arch/x86/mm/kaiser.c                       |  2 +-
 drivers/acpi/acpi_processor.c              |  9 ---
 drivers/acpi/glue.c                        | 12 ++--
 drivers/acpi/processor_throttling.c        |  9 +++
 drivers/base/cacheinfo.c                   | 15 +++--
 drivers/base/power/trace.c                 |  4 +-
 drivers/input/mouse/trackpoint.c           |  3 +
 drivers/mmc/host/sdhci-of-esdhc.c          | 10 +++
 drivers/net/ethernet/realtek/r8169.c       |  9 +--
 drivers/net/ppp/pppoe.c                    | 11 ++--
 drivers/net/usb/lan78xx.c                  |  1 +
 drivers/net/vmxnet3/vmxnet3_drv.c          |  2 +-
 drivers/pci/host/pci-layerscape.c          | 22 ++++---
 drivers/scsi/libiscsi.c                    |  2 +-
 drivers/usb/usbip/stub_dev.c               |  3 +-
 drivers/usb/usbip/stub_rx.c                | 46 +++++++++++---
 drivers/usb/usbip/usbip_common.c           | 15 ++---
 drivers/usb/usbip/usbip_common.h           |  1 +
 drivers/usb/usbip/usbip_event.c            |  5 +-
 drivers/usb/usbip/vhci_hcd.c               | 90 ++++++++++++++++-----------
 drivers/usb/usbip/vhci_rx.c                | 30 +++++----
 drivers/usb/usbip/vhci_sysfs.c             | 44 ++++++++------
 drivers/usb/usbip/vhci_tx.c                | 14 +++--
 fs/ext2/acl.c                              | 36 ++++++-----
 fs/fcntl.c                                 |  4 ++
 fs/nfsd/auth.c                             |  5 +-
 fs/reiserfs/bitmap.c                       | 14 ++++-
 fs/reiserfs/xattr_acl.c                    | 12 ++--
 fs/select.c                                | 14 ++++-
 include/linux/cacheinfo.h                  |  1 +
 include/linux/ktime.h                      |  7 +++
 include/linux/sched.h                      |  1 +
 include/linux/tcp.h                        |  7 ++-
 include/linux/vermagic.h                   |  8 +--
 include/net/arp.h                          |  3 +
 include/net/ipv6.h                         |  1 +
 include/net/net_namespace.h                | 10 +++
 include/uapi/linux/eventpoll.h             | 13 ++++
 ipc/msg.c                                  |  5 +-
 kernel/sched/core.c                        |  2 +
 kernel/sched/deadline.c                    | 98 ++++++++++++++++++++++++++----
 kernel/time/hrtimer.c                      |  5 +-
 kernel/time/timer.c                        |  9 ++-
 mm/cma.c                                   | 15 ++---
 mm/memcontrol.c                            |  2 +-
 mm/memory-failure.c                        |  7 +++
 mm/mmap.c                                  |  6 +-
 mm/page_alloc.c                            |  6 +-
 net/can/af_can.c                           | 22 +++----
 net/core/dev.c                             | 19 ++++--
 net/core/flow_dissector.c                  |  3 +-
 net/core/neighbour.c                       |  4 +-
 net/dccp/ccids/ccid2.c                     |  3 +
 net/ipv4/arp.c                             |  7 ++-
 net/ipv4/igmp.c                            |  2 +-
 net/ipv4/netfilter/arp_tables.c            |  4 +-
 net/ipv4/netfilter/nf_reject_ipv4.c        |  2 +
 net/ipv4/tcp.c                             |  3 +
 net/ipv4/tcp_timer.c                       | 15 +++++
 net/ipv6/ip6_output.c                      |  9 ++-
 net/ipv6/ipv6_sockglue.c                   |  2 +-
 net/ipv6/netfilter/nf_dup_ipv6.c           |  1 +
 net/ipv6/netfilter/nf_reject_ipv6.c        |  3 +
 net/netfilter/nf_conntrack_core.c          |  7 +++
 net/netfilter/nf_conntrack_sip.c           |  5 +-
 net/netfilter/nfnetlink_queue.c            |  6 +-
 net/sctp/socket.c                          | 30 ++++-----
 tools/usb/usbip/libsrc/usbip_common.c      |  9 ++-
 tools/usb/usbip/libsrc/usbip_host_driver.c | 27 ++++++--
 tools/usb/usbip/libsrc/vhci_driver.c       |  8 +--
 tools/usb/usbip/src/usbip.c                |  2 +
 83 files changed, 687 insertions(+), 277 deletions(-)

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

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


Status: Fixed (was: Assigned)
 Issue 799704  has been merged into this issue.

Sign in to add a comment