Merge v4.4.127 into chromeos-4.4 |
||||
Issue descriptionMerge v4.4.127 into chromeos-4.4
,
Apr 9 2018
,
Apr 12 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/83e5d6d0b0339f6555e0bf0b40862aacc66a8568 commit 83e5d6d0b0339f6555e0bf0b40862aacc66a8568 Author: Guenter Roeck <groeck@chromium.org> Date: Mon Apr 09 18:37:52 2018 CHROMIUM: Merge 'v4.4.127' into chromeos-4.4 Merge of v4.4.127 into chromeos-4.4 Conflicts: net/netfilter/nf_conntrack_netlink.c fs/proc/task_mmu.c Changelog: ---------------------------------------------------------------- Alexander Gerasiov (1): parport_pc: Add support for WCH CH382L PCI-E single parallel port card. Alexander Potapenko (1): llist: clang: introduce member_address_is_nonnull() Alexey Kodanev (1): dccp: check sk for closed state in dccp_sendmsg() Andy Lutomirski (1): fs/proc: Stop trying to report thread stacks Arkadi Sharshevsky (1): team: Fix double free in error path Arnd Bergmann (1): tty: provide tty_name() even without CONFIG_TTY Arvind Yadav (1): net/iucv: Free memory obtained by kzalloc Christophe JAILLET (1): net: ethernet: arc: Fix a potential memory leak if an optional regulator is deferred Clemens Werther (1): USB: serial: ftdi_sio: add support for Harman FirmwareHubEmulator Colin Ian King (2): ACPI, PCI, irq: remove redundant check for null string pointer mei: remove dev_err message on an unsupported ioctl Dan Carpenter (1): ALSA: pcm: potential uninitialized return values Dan Williams (1): nospec: Kill array_index_nospec_mask_check() David Ahern (1): net: Only honor ifindex in IP_PKTINFO if non-0 Dennis Wassenberg (1): Input: i8042 - add Lenovo ThinkPad L460 to i8042 reset list Eric Biggers (1): crypto: x86/cast5-avx - fix ECB encryption when long sg follows short one Eric Dumazet (2): l2tp: do not accept arbitrary sockets ieee802154: 6lowpan: fix possible NULL deref in lowpan_device_event() Felipe F. Tonello (4): usb: gadget: define free_ep_req as universal function usb: gadget: change len to size_t on alloc_ep_req() usb: gadget: fix usb_ep_align_maybe endianness and new usb_ep_align usb: gadget: align buffer size when allocating for OUT endpoint Florian Fainelli (2): net: fec: Fix unbalanced PM runtime calls net: systemport: Rewrite __bcm_sysport_tx_reclaim() Florian Westphal (3): xfrm_user: uncoditionally validate esn replay attribute struct netfilter: bridge: ebt_among: add more missing match size checks netfilter: x_tables: add and use xt_check_proc_name Frank Mori Hess (1): staging: comedi: ni_mio_common: ack ai fifo error interrupts. Greg Hackmann (1): net: xfrm: use preempt-safe this_cpu_read() in ipcomp_alloc_tfms() Greg Kroah-Hartman (11): Revert "genirq: Use irqd_get_trigger_type to compare the trigger type for shared IRQs" Linux 4.4.126 Revert "PCI/MSI: Stop disabling MSI/MSI-X in pci_device_shutdown()" Revert "ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin" Revert "ARM: dts: omap3-n900: Fix the audio CODEC's reset pin" Revert "cpufreq: Fix governor module removal race" Revert "mtip32xx: use runtime tag to initialize command header" spi: davinci: fix up dma_mapping_error() incorrect patch net: cavium: liquidio: fix up "Avoid dma_unmap_single on uninitialized ndata" Revert "ip6_vti: adjust vti mtu according to mtu of lower device" Linux 4.4.127 Guenter Roeck (1): Merge remote-tracking branch 'origin/linux/v4.4.127' into merge/chromeos-4.4-v4.4.127 Guoqing Jiang (1): md/raid10: reset the 'first' at the end of loop Herbert Xu (1): crypto: ahash - Fix early termination in hash walk Johan Hovold (1): USB: serial: cp210x: add ELDAT Easywave RX09 id Johannes Thumshirn (1): scsi: sg: don't return bogus Sg_requests John Stultz (1): usb: dwc2: Improve gadget state disconnection handling Julian Wiedmann (4): s390/qeth: free netdevice when removing a card s390/qeth: when thread completes, wake up all waiters s390/qeth: lock read device while queueing next buffer s390/qeth: on channel error, reject further cmd requests Kaixu Xia (1): writeback: fix the wrong congested state variable definition Keerthy (3): Documentation: pinctrl: palmas: Add ti,palmas-powerhold-override property definition ARM: dts: dra7: Add power hold and power controller properties to palmas ARM: dts: am57xx-beagle-x15-common: Add overide powerhold property Kirill Tkhai (1): net: Fix hlist corruptions in inet_evict_bucket() Krzysztof Opasiak (1): usb: gadget: f_hid: fix: Prevent accessing released memory Leon Romanovsky (6): RDMA/ucma: Check AF family prior resolving address RDMA/ucma: Fix use-after-free access in ucma_close RDMA/ucma: Ensure that CM_ID exists prior to access it RDMA/ucma: Check that device is connected prior to access it RDMA/ucma: Check that device exists prior to accessing it RDMA/ucma: Don't allow join attempts for unsupported AF family Linus Torvalds (1): perf/hwbp: Simplify the perf-hwbp code, fix documentation Linus Walleij (1): mtd: jedec_probe: Fix crash in jedec_read_mfr() Lorenzo Bianconi (1): ipv6: fix access to non-linear packet in ndisc_fill_redirect_hdr_option() Major Hayden (1): USB: serial: ftdi_sio: add RT Systems VX-8 cable Mark Charlebois (1): fs: compat: Remove warning from COMPATIBLE_IOCTL Masami Hiramatsu (1): kprobes/x86: Fix to set RWX bits correctly before releasing trampoline Matthias Brugger (1): net: hns: Fix ethtool private flags Matthias Kaehlcke (9): PCI: Make PCI_ROM_ADDRESS_MASK a 32-bit constant dm ioctl: remove double parentheses genirq: Use cpumask_available() for check of cpumask variable cpumask: Add helper cpumask_available() selinux: Remove unnecessary check of array base in selinux_set_mapping() jiffies.h: declare jiffies and jiffies_64 with ____cacheline_aligned_in_smp frv: declare jiffies to be located in the .data section netfilter: ctnetlink: Make some parameters integer to avoid enum mismatch selinux: Remove redundant check for unknown labeling behavior Mike Frysinger (1): vt: change SGR 21 to follow the standards Nick Desaulniers (3): Input: mousedev - fix implicit conversion warning netfilter: nf_nat_h323: fix logical-not-parentheses warning arm64: avoid overflow in VA_START and PAGE_OFFSET Nicolas Dichtel (1): netlink: avoid a double skb free in genlmsg_mcast() Oliver Neukum (1): media: usbtv: prevent double free in error case Ondrej Zary (1): Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad Paolo Bonzini (1): scsi: virtio_scsi: always read VPD pages for multiqueue too Richard Guy Briggs (1): audit: add tty field to LOGIN event Richard Narron (1): partitions/msdos: Unable to mount UFS 44bsd partitions Roland Dreier (1): RDMA/ucma: Introduce safer rdma_addr_size() variants SZ Lin (林上智) (1): net: ethernet: ti: cpsw: add check for in-band mode setting with RGMII PHY interface Stefan Roese (1): ALSA: pcm: Use dma_bytes as size parameter in dma_mmap_coherent() Steffen Klassert (1): xfrm: Refuse to insert 32 bit userspace socket policies on 64 bit systems Szymon Janc (1): Bluetooth: Fix missing encryption refresh on Security Request Vinicius Costa Gomes (1): skbuff: Fix not waking applications when errors are enqueued Will Deacon (1): nospec: Move array_index_nospec() parameter checking into separate macro .../devicetree/bindings/pinctrl/pinctrl-palmas.txt | 9 +++ Documentation/filesystems/proc.txt | 26 --------- Makefile | 2 +- arch/arm/boot/dts/am335x-pepper.dts | 2 +- arch/arm/boot/dts/am57xx-beagle-x15.dts | 1 + arch/arm/boot/dts/dra7-evm.dts | 2 + arch/arm/boot/dts/omap3-n900.dts | 4 +- arch/arm64/include/asm/memory.h | 6 +- arch/x86/crypto/cast5_avx_glue.c | 3 +- arch/x86/kernel/kprobes/core.c | 9 +++ block/partitions/msdos.c | 4 +- crypto/ahash.c | 7 ++- drivers/block/mtip32xx/mtip32xx.c | 36 ++++-------- drivers/cpufreq/cpufreq.c | 6 -- drivers/infiniband/core/addr.c | 16 ++++++ drivers/infiniband/core/ucma.c | 67 +++++++++++++++------- drivers/input/mousedev.c | 62 +++++++++++--------- drivers/input/serio/i8042-x86ia64io.h | 24 ++++++++ drivers/md/raid10.c | 1 + drivers/media/usb/usbtv/usbtv-core.c | 2 + drivers/misc/mei/main.c | 1 - drivers/mtd/chips/jedec_probe.c | 2 + drivers/net/ethernet/arc/emac_rockchip.c | 6 +- drivers/net/ethernet/broadcom/bcmsysport.c | 33 +++++------ drivers/net/ethernet/broadcom/bcmsysport.h | 2 +- drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- drivers/net/ethernet/freescale/fec_main.c | 2 + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 +- drivers/net/ethernet/ti/cpsw.c | 3 +- drivers/net/team/team.c | 4 +- drivers/parport/parport_pc.c | 4 ++ drivers/pci/pci-driver.c | 2 + drivers/pci/setup-res.c | 2 +- drivers/s390/net/qeth_core_main.c | 21 +++++-- drivers/s390/net/qeth_l2_main.c | 2 +- drivers/s390/net/qeth_l3_main.c | 2 +- drivers/scsi/sg.c | 5 +- drivers/scsi/virtio_scsi.c | 1 + drivers/spi/spi-davinci.c | 2 +- drivers/staging/comedi/drivers/ni_mio_common.c | 2 + drivers/tty/vt/vt.c | 6 +- drivers/usb/dwc2/hcd.c | 7 ++- drivers/usb/gadget/function/f_hid.c | 24 ++++++-- drivers/usb/gadget/function/f_midi.c | 6 -- drivers/usb/gadget/function/f_sourcesink.c | 6 -- drivers/usb/gadget/function/g_zero.h | 1 - drivers/usb/gadget/u_f.c | 6 +- drivers/usb/gadget/u_f.h | 26 ++++++++- drivers/usb/serial/cp210x.c | 1 + drivers/usb/serial/ftdi_sio.c | 2 + drivers/usb/serial/ftdi_sio_ids.h | 9 +++ fs/proc/task_mmu.c | 29 ++++------ fs/proc/task_nommu.c | 28 ++++----- include/linux/netfilter/x_tables.h | 2 + include/linux/nospec.h | 14 ----- include/linux/tty.h | 4 +- include/linux/usb/gadget.h | 17 +++++- include/rdma/ib_addr.h | 2 + kernel/events/hw_breakpoint.c | 30 +++------- kernel/kprobes.c | 2 +- net/bluetooth/smp.c | 8 ++- net/bridge/netfilter/ebt_among.c | 34 +++++++++++ net/core/skbuff.c | 2 +- net/dccp/proto.c | 5 ++ net/ieee802154/6lowpan/core.c | 12 ++-- net/ipv4/inet_fragment.c | 3 + net/ipv4/ip_sockglue.c | 6 +- net/ipv4/netfilter/nf_nat_h323.c | 57 +++++++++--------- net/ipv6/ip6_vti.c | 20 ------- net/ipv6/ndisc.c | 3 +- net/iucv/af_iucv.c | 4 +- net/l2tp/l2tp_core.c | 8 ++- net/netfilter/nf_conntrack_netlink.c | 5 +- net/netfilter/x_tables.c | 30 ++++++++++ net/netfilter/xt_hashlimit.c | 5 +- net/netfilter/xt_recent.c | 6 +- net/netlink/genetlink.c | 2 +- net/xfrm/xfrm_ipcomp.c | 2 +- net/xfrm/xfrm_state.c | 5 ++ net/xfrm/xfrm_user.c | 21 +++---- sound/core/oss/pcm_oss.c | 4 +- sound/core/pcm_native.c | 2 +- 85 files changed, 514 insertions(+), 349 deletions(-) BUG= chromium:828099 TEST=Build and test on various affected systems Change-Id: I5ae22af794392bba69d29d6dc48c0679555dc136 Signed-off-by: Guenter Roeck <groeck@chromium.org> [modify] https://crrev.com/83e5d6d0b0339f6555e0bf0b40862aacc66a8568/fs/proc/task_mmu.c [modify] https://crrev.com/83e5d6d0b0339f6555e0bf0b40862aacc66a8568/net/netfilter/nf_conntrack_netlink.c
,
Apr 12 2018
|
||||
►
Sign in to add a comment |
||||
Comment 1 by groeck@chromium.org
, Apr 9 2018