Merge v4.4.164 into chromeos-4.4 |
|||
Issue descriptionMerge v4.4.164 into chromeos-4.4
,
Nov 25
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/96ce5bbd9c0b5f67ac291dcecb12a3e6ba38c1fe commit 96ce5bbd9c0b5f67ac291dcecb12a3e6ba38c1fe Author: Guenter Roeck <groeck@chromium.org> Date: Wed Nov 21 18:33:30 2018 CHROMIUM: Merge 'v4.4.164' into chromeos-4.4 Merge of v4.4.164 into chromeos-4.4 Conflicts: fs/ext4/resize.c Changelog: ---------------------------------------------------------------- Aaro Koskinen (1): MIPS: OCTEON: fix out of bounds array access on CN68XX Al Viro (1): gfs2_meta: ->mount() can get NULL dev_name Alex Stanoev (1): ALSA: ca0106: Disable IZD on SB0570 DAC to fix audio pops Alexander Duyck (1): libnvdimm: Hold reference on parent while scheduling async init Alexandre Belloni (1): uio: ensure class is registered before devices Amir Goldstein (1): lockd: fix access beyond unterminated strings in prints Andrea Arcangeli (1): mm: thp: relax __GFP_THISNODE for MADV_HUGEPAGE mappings Andreas Kemnade (1): w1: omap-hdq: fix missing bus unregister at removal Arnd Bergmann (2): kbuild: fix kernel/bounds.c 'W=1' warning mtd: docg3: don't set conflicting BCH_CONST_PARAMS option Ben Hutchings (1): x86: boot: Fix EFI stub alignment Bin Meng (1): PCI: Add Device IDs for Intel GPU "spurious interrupt" quirk Breno Leitao (1): HID: hiddev: fix potential Spectre v1 Changwei Ge (1): ocfs2: fix a misuse a of brelse after failing ocfs2_check_dir_entry Christian Hewitt (1): Bluetooth: btbcm: Add entry for BCM4335C0 UART bluetooth Christophe Leroy (1): powerpc/msi: Fix compile error on mpc83xx Clint Taylor (1): drm/i915/hdmi: Add HDMI 2.0 audio clock recovery N values Colin Ian King (1): e1000: avoid null pointer dereference on invalid stat type Daniel Axtens (1): powerpc/nohash: fix undefined behaviour when testing page size support Daniel Wagner (1): x86/kconfig: Fall back to ticket spinlocks David S. Miller (1): sparc: Fix single-pcr perf event counter management. Dengcheng Zhu (1): MIPS: kexec: Mark CPU offline before disabling local IRQ Dmitry Bazhenov (1): hwmon: (pmbus) Fix page count auto-detection. Dominique Martinet (2): 9p locks: fix glock.client_id leak in do_lock 9p: clear dangling pointers in p9stat_free Douglas Anderson (2): pinctrl: spmi-mpp: Fix pmic_mpp_config_get() to be compliant pinctrl: ssbi-gpio: Fix pm8xxx_pin_config_get() to be compliant Dr. Greg Wettstein (1): tpm: Restore functionality to xen vtpm driver. Eric Biggers (1): ima: fix showing large 'violations' or 'runtime_measurements_count' Eric W. Biederman (5): signal: Always deliver the kernel's SIGKILL and SIGSTOP to a pid namespace init signal/GenWQE: Fix sending of SIGKILL mount: Retest MNT_LOCKED in do_umount mount: Don't allow copying MNT_UNBINDABLE|MNT_LOCKED mounts mount: Prevent MNT_DETACH from disconnecting locked mounts Eugen Hristev (2): iio: adc: at91: fix acking DRDY irq on simple conversions iio: adc: at91: fix wrong channel number in triggered buffer mode Filipe Manana (3): Btrfs: fix wrong dentries after fsync of file that got its parent replaced Btrfs: fix null pointer dereference on compressed write path error Btrfs: fix data corruption due to cloning of eof block Finn Thain (1): scsi: esp_scsi: Track residual for PIO transfers Frank Sorenson (1): sunrpc: correct the computation for page_ptr when truncating Greg Edwards (1): vhost/scsi: truncate T10 PI iov_iter to prot_bytes Greg Kroah-Hartman (1): Linux 4.4.164 Guenter Roeck (2): configfs: replace strncpy with memcpy Merge remote-tracking branch 'origin/linux/v4.4.164' into merge/chromeos-4.4-v4.4.164 H. Peter Anvin (1): termios, tty/tty_baudrate.c: fix buffer overrun H. Peter Anvin (Intel) (1): arch/alpha, termios: implement BOTHER, IBSHIFT and termios2 Hans de Goede (1): ACPI / LPSS: Add alternative ACPI HIDs for Cherry Trail DMA controllers He Zhe (3): x86/corruption-check: Fix panic in memory_corruption_check() when boot option without value is provided printk: Fix panic caused by passing log_buf_len to command line kgdboc: Passing ekgdboc to command line causes panic Helge Deller (1): parisc: Fix map_pages() to not overwrite existing pte entries Himanshu Madhani (1): scsi: qla2xxx: Fix incorrect port speed being set for FC adapters Hou Tao (1): jffs2: free jffs2_sb_info through jffs2_kill_sb() Huacai Chen (2): MIPS: Loongson-3: Fix CPU UART irq delivery problem MIPS: Loongson-3: Fix BRIDGE irq delivery problem Ilya Dryomov (1): libceph: bump CEPH_MSG_MAX_DATA_LEN James Smart (1): scsi: lpfc: Correct soft lockup when running mds diagnostics Jan Glauber (1): ipmi: Fix timer race with module unload Jan Kara (1): jbd2: fix use after free in jbd2_log_do_checkpoint() Javier Martinez Canillas (1): tpm: suppress transmit cmd error logs when TPM 1.2 is disabled/deactivated Jeff Mahoney (2): btrfs: iterate all devices during trim, instead of fs_devices::alloc_list btrfs: don't attempt to trim devices that don't support it Jeremy Cline (1): ALSA: hda - Add mic quirk for the Lenovo G50-30 (17aa:3905) Joe Jin (1): xen-swiotlb: use actually allocated size on check physical continuous Joel Stanley (1): powerpc/boot: Ensure _zimage_start is a weak symbol Johan Hovold (1): soc/tegra: pmc: Fix child-node lookup John David Anglin (1): parisc: Fix address in HPMC IVA Josef Bacik (4): btrfs: wait on caching when putting the bg cache btrfs: reset max_extent_size on clear in a bitmap btrfs: make sure we create all new block groups btrfs: set max_extent_size properly Juergen Gross (3): xen: fix race in xen_qlock_wait() xen: make xen_qlock_wait() nestable xen: fix xen_qlock_wait() Kees Cook (3): binfmt_elf: fix calculations for bss padding mm: refuse wrapped vm_brk requests bna: ethtool: Avoid reading past end of buffer Kirill Tkhai (2): fuse: Fix use-after-free in fuse_dev_do_read() fuse: Fix use-after-free in fuse_dev_do_write() Krzysztof Kozlowski (1): clk: s2mps11: Fix matching when built as module and DT node contains compatible Loic Poulain (1): usb: chipidea: Prevent unbalanced IRQ disable Lukas Czerner (1): ext4: initialize retries variable in ext4_da_write_inline_data_begin() Lukas Wunner (1): genirq: Fix race on spurious interrupt detection Maciej S. Szmigiero (1): pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges Maciej W. Rozycki (2): TC: Set DMA masks for devices rtc: hctosys: Add missing range error reporting Marc Zyngier (1): drm/rockchip: Allow driver to be shutdown on reboot/kexec Marco Felsch (1): media: tvp5150: fix width alignment during set_selection() Martin Willi (1): ath10k: schedule hardware restart if WMI command times out Masami Hiramatsu (2): selftests: ftrace: Add synthetic event syntax testcase kprobes: Return error if we fail to reuse kprobe instead of BUG_ON() Mauro Carvalho Chehab (3): media: em28xx: use a default format if TRY_FMT fails media: em28xx: fix input name for Terratec AV 350 media: em28xx: make v4l2-compliance happier by starting sequence on zero Max Filippov (3): xtensa: add NOTES section to the linker script xtensa: make sure bFLT stack is 16 byte aligned xtensa: fix boot parameters address translation Michael Kelley (1): clockevents/drivers/i8253: Add support for PIT shutdown quirk Michal Hocko (2): mm, elf: handle vm_brk error mm: do not bug_on on incorrect length in __mm_populate() Mike Kravetz (3): hugetlbfs: dirty pages as they are added to pagecache hugetlbfs: fix kernel BUG at fs/hugetlbfs/inode.c:444! mm: migration: fix migration of huge PMD shared pages Miklos Szeredi (3): fuse: fix blocked_waitq wakeup fuse: set FR_SENT while locked fuse: fix leaked notify reply Mikulas Patocka (2): mach64: fix display corruption on big endian machines mach64: fix image corruption due to reading accelerator registers Miles Chen (1): tty: check name length in tty_find_polling_driver() Nathan Chancellor (1): net: qla3xxx: Remove overflowing shift statement Nicholas Mc Guire (1): media: pci: cx23885: handle adding to list failure Nicolas Pitre (1): Cramfs: fix abad comparison when wrap-arounds occur Omar Sandoval (2): ataflop: fix error handling during setup swim: fix cleanup on setup error Ondrej Mosnacek (1): crypto: lrw - Fix out-of bounds access on counter overflow Oscar Salvador (1): fs, elf: make sure to page align bss in load_elf_library Paul Cercueil (1): dmaengine: dma-jz4780: Return error if not probed from DT Phil Elwell (1): sc16is7xx: Fix for multi-channel stall Qu Wenruo (3): btrfs: Handle owner mismatch gracefully when walking up tree btrfs: locking: Add extra check in btrfs_init_new_buffer() to avoid deadlock btrfs: qgroup: Dirty all qgroups before rescan Sanskriti Sharma (2): perf tools: Free temporary 'sys' string in read_event_files() perf tools: Cleanup trace-event-info 'tdata' leak Sebastian Andrzej Siewior (1): x86/fpu: Remove second definition of fpu in __fpu__restore_sig() Serhey Popovych (1): tun: Consistently configure generic netdev params via rtnetlink Shaohua Li (2): MD: fix invalid stored role for a disk MD: fix invalid stored role for a disk - try2 Stanislav Lisovskiy (1): drm/dp_mst: Check if primary mstb is null Stefan Nuernberger (1): net/ipv4: defensive cipso option parsing Stephen Boyd (1): pinctrl: qcom: spmi-mpp: Fix drive strength setting Steve French (3): smb3: allow stats which track session and share reconnects to be reset smb3: do not attempt cifs operation in smb3 query info error path smb3: on kerberos mount if server doesn't specify auth type use krb5 Takashi Iwai (1): ALSA: hda: Check the non-cached stream buffers more explicitly Tang Junhui (1): bcache: fix miss key refill->end in writeback Theodore Ts'o (4): ext4: fix argument checking in EXT4_IOC_MOVE_EXT ext4: avoid running out of journal credits when appending to an inline file ext4: avoid possible double brelse() in add_new_gdb() on error path ext4: fix possible leak of sbi->s_group_desc_leak in error path Thor Thayer (1): arm64: dts: stratix10: Correct System Manager register size Tomi Valkeinen (1): drm/omap: fix memory barrier bug in DMM driver Trond Myklebust (2): NFSv4.1: Fix the r/wsize checking nfsd: Fix an Oops in free_session() Vasily Averin (10): ext4: add missing brelse() update_backups()'s error path ext4: add missing brelse() in set_flexbg_block_bitmap()'s error path ext4: add missing brelse() add_new_gdb_meta_bg()'s error path ext4: avoid potential extra brelse in setup_new_flex_group_blocks() ext4: fix possible inode leak in the retry loop of ext4_resize_fs() ext4: avoid buffer leak in ext4_orphan_add() after prior errors ext4: fix missing cleanup if ext4_alloc_flex_bg_array() fails while resizing ext4: release bs.bh before re-using in ext4_xattr_block_find() ext4: fix buffer leak in ext4_xattr_move_to_block() on error path ext4: fix buffer leak in __ext4_read_dirblock() on error path Vincenzo Maffione (1): e1000: fix race condition between e1000_down() and e1000_watchdog Waiman Long (2): locking/lockdep: Fix debug_locks off performance problem driver/dma/ioat: Call del_timer_sync() without holding prep_lock Wenwen Wang (2): scsi: megaraid_sas: fix a missing-check bug dm ioctl: harden copy_params()'s copy_from_user() from malicious users Young_X (1): cdrom: fix improper type cast, which can leat to information leak. Yu Zhao (1): mmc: sdhci-pci-o2micro: Add quirk for O2 Micro dev 0x8620 rev 0x01 YueHaibing (1): pinctrl: qcom: spmi-mpp: Fix err handling of pmic_mpp_set_mux Makefile | 2 +- arch/alpha/include/asm/termios.h | 8 ++- arch/alpha/include/uapi/asm/ioctls.h | 5 ++ arch/alpha/include/uapi/asm/termbits.h | 17 +++++ arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 2 +- arch/mips/cavium-octeon/executive/cvmx-helper.c | 2 +- arch/mips/include/asm/mach-loongson64/irq.h | 2 +- arch/mips/kernel/crash.c | 3 + arch/mips/kernel/machine_kexec.c | 3 + arch/mips/loongson64/loongson-3/irq.c | 56 ++------------- arch/parisc/kernel/entry.S | 2 +- arch/parisc/kernel/traps.c | 3 +- arch/parisc/mm/init.c | 8 +-- arch/powerpc/boot/crt0.S | 4 +- arch/powerpc/include/asm/mpic.h | 7 ++ arch/powerpc/mm/tlb_nohash.c | 3 + arch/sparc/kernel/perf_event.c | 17 +++-- arch/x86/Kconfig | 1 - arch/x86/boot/tools/build.c | 7 ++ arch/x86/kernel/check.c | 15 ++++ arch/x86/kernel/fpu/signal.c | 1 - arch/x86/xen/spinlock.c | 35 ++++------ arch/xtensa/boot/Makefile | 2 +- arch/xtensa/include/asm/processor.h | 6 +- arch/xtensa/kernel/head.S | 7 +- arch/xtensa/kernel/vmlinux.lds.S | 1 + crypto/lrw.c | 7 +- drivers/acpi/acpi_lpss.c | 2 + drivers/block/ataflop.c | 25 ++++--- drivers/block/swim.c | 13 +++- drivers/bluetooth/btbcm.c | 1 + drivers/cdrom/cdrom.c | 2 +- drivers/char/ipmi/ipmi_ssif.c | 10 +-- drivers/char/tpm/tpm-interface.c | 3 +- drivers/char/tpm/xen-tpmfront.c | 2 +- drivers/clk/clk-s2mps11.c | 30 ++++++++ drivers/clocksource/i8253.c | 14 +++- drivers/dma/dma-jz4780.c | 5 ++ drivers/dma/ioat/init.c | 9 ++- drivers/gpu/drm/drm_dp_mst_topology.c | 3 + drivers/gpu/drm/i915/intel_audio.c | 17 +++++ drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 11 +++ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 6 ++ drivers/hid/usbhid/hiddev.c | 18 +++-- drivers/hwmon/pmbus/pmbus.c | 2 + drivers/hwmon/pmbus/pmbus_core.c | 5 +- drivers/iio/adc/at91_adc.c | 6 +- drivers/md/bcache/btree.c | 2 +- drivers/md/dm-ioctl.c | 18 ++--- drivers/md/raid1.c | 1 + drivers/md/raid10.c | 1 + drivers/media/i2c/tvp5150.c | 14 ++-- drivers/media/pci/cx23885/altera-ci.c | 10 +++ drivers/media/usb/em28xx/em28xx-cards.c | 4 +- drivers/media/usb/em28xx/em28xx-video.c | 8 ++- drivers/misc/genwqe/card_base.h | 2 +- drivers/misc/genwqe/card_dev.c | 9 +-- drivers/mmc/host/sdhci-pci-o2micro.c | 3 + drivers/mtd/devices/Kconfig | 2 +- drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 9 ++- drivers/net/ethernet/intel/e1000/e1000_main.c | 11 ++- drivers/net/ethernet/qlogic/qla3xxx.c | 2 - drivers/net/tun.c | 2 + drivers/net/wireless/ath/ath10k/wmi.c | 6 ++ drivers/nvdimm/bus.c | 4 ++ drivers/pci/quirks.c | 4 ++ drivers/pcmcia/ricoh.h | 35 ++++++++++ drivers/pcmcia/yenta_socket.c | 3 +- drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 27 +++++--- drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 28 ++++++-- drivers/rtc/hctosys.c | 4 +- drivers/scsi/esp_scsi.c | 1 + drivers/scsi/esp_scsi.h | 2 + drivers/scsi/lpfc/lpfc_sli.c | 7 ++ drivers/scsi/mac_esp.c | 2 + drivers/scsi/megaraid/megaraid_sas_base.c | 3 + drivers/scsi/qla2xxx/qla_mbx.c | 5 +- drivers/soc/tegra/pmc.c | 2 +- drivers/tc/tc.c | 8 ++- drivers/tty/serial/kgdboc.c | 5 ++ drivers/tty/serial/sc16is7xx.c | 19 +++-- drivers/tty/tty_io.c | 2 +- drivers/tty/tty_ioctl.c | 4 +- drivers/uio/uio.c | 9 +++ drivers/usb/chipidea/otg.h | 3 +- drivers/vhost/scsi.c | 4 +- drivers/video/fbdev/aty/mach64_accel.c | 28 ++++---- drivers/w1/masters/omap_hdq.c | 2 + drivers/xen/swiotlb-xen.c | 6 ++ fs/9p/vfs_file.c | 16 ++++- fs/binfmt_elf.c | 46 +++++++------ fs/btrfs/extent-tree.c | 48 ++++++++++--- fs/btrfs/free-space-cache.c | 32 ++++++--- fs/btrfs/inode.c | 1 + fs/btrfs/ioctl.c | 12 +++- fs/btrfs/qgroup.c | 1 + fs/btrfs/relocation.c | 2 +- fs/btrfs/tree-log.c | 30 +++++++- fs/cifs/cifs_debug.c | 3 + fs/cifs/cifs_spnego.c | 6 +- fs/cifs/inode.c | 10 ++- fs/configfs/symlink.c | 2 +- fs/cramfs/inode.c | 3 +- fs/ext4/ext4.h | 3 - fs/ext4/inline.c | 40 +---------- fs/ext4/move_extent.c | 8 ++- fs/ext4/namei.c | 5 +- fs/ext4/resize.c | 27 ++++---- fs/ext4/super.c | 16 ++--- fs/ext4/xattr.c | 22 ++---- fs/fuse/dev.c | 29 ++++++-- fs/gfs2/ops_fstype.c | 3 + fs/jbd2/checkpoint.c | 4 +- fs/jffs2/super.c | 4 +- fs/lockd/host.c | 2 +- fs/namespace.c | 22 ++++-- fs/nfs/nfs4client.c | 16 +++-- fs/ocfs2/dir.c | 3 +- include/linux/ceph/libceph.h | 8 ++- include/linux/hugetlb.h | 14 ++++ include/linux/i8253.h | 1 + include/linux/mm.h | 6 ++ include/linux/tc.h | 1 + kernel/bounds.c | 4 +- kernel/irq/manage.c | 8 ++- kernel/kprobes.c | 27 ++++++-- kernel/locking/lockdep.c | 4 +- kernel/printk/printk.c | 7 +- kernel/signal.c | 2 +- lib/debug_locks.c | 2 +- mm/gup.c | 2 - mm/hugetlb.c | 66 ++++++++++++++++-- mm/mempolicy.c | 32 ++++++++- mm/mmap.c | 13 ++-- mm/rmap.c | 56 +++++++++++++++ net/9p/protocol.c | 5 ++ net/ipv4/cipso_ipv4.c | 11 +-- net/sunrpc/svc_xprt.c | 2 +- net/sunrpc/xdr.c | 5 +- security/integrity/ima/ima_fs.c | 6 +- sound/pci/ca0106/ca0106.h | 2 +- sound/pci/hda/hda_controller.h | 1 + sound/pci/hda/hda_intel.c | 11 ++- sound/pci/hda/patch_conexant.c | 1 + tools/perf/util/trace-event-info.c | 2 + tools/perf/util/trace-event-read.c | 5 +- .../inter-event/trigger-synthetic-event-syntax.tc | 80 ++++++++++++++++++++++ 147 files changed, 1111 insertions(+), 420 deletions(-) create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-syntax.tc BUG= chromium:907409 TEST=Build and test on various affected systems Change-Id: Icc6980cd0e639a4e328150c244dccd445c60d894 Signed-off-by: Guenter Roeck <groeck@chromium.org> [modify] https://crrev.com/96ce5bbd9c0b5f67ac291dcecb12a3e6ba38c1fe/fs/ext4/resize.c
,
Nov 25
|
|||
►
Sign in to add a comment |
|||
Comment 1 by groeck@chromium.org
, Nov 23