Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da15d885 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.14-p.67 (75ac55a8) into msm-4.14 



* refs/heads/tmp-75ac55a8:
  Linux 4.14.67
  reiserfs: fix broken xattr handling (heap corruption, bad retval)
  i2c: imx: Fix race condition in dma read
  i2c: core: ACPI: Properly set status byte to 0 for multi-byte writes
  PCI: pciehp: Fix unprotected list iteration in IRQ handler
  PCI: pciehp: Fix use-after-free on unplug
  PCI: Skip MPS logic for Virtual Functions (VFs)
  PCI: hotplug: Don't leak pci_slot on registration failure
  parisc: Remove unnecessary barriers from spinlock.h
  net/smc: no shutdown in state SMC_LISTEN
  packet: refine ring v3 block size test to hold one frame
  netfilter: conntrack: dccp: treat SYNC/SYNCACK as invalid if no prior state
  xfrm_user: prevent leaking 2 bytes of kernel memory
  parisc: Remove ordered stores from syscall.S
  f2fs: sanity check for total valid node blocks
  f2fs: return error during fill_super
  KVM: irqfd: fix race between EPOLLHUP and irq_bypass_register_consumer
  nvme: fix handling of metadata_len for NVME_IOCTL_IO_CMD
  ARM: dts: imx6: RDU2: fix irq type for mv88e6xxx switch
  ACPI / EC: Use ec_no_wakeup on more Thinkpad X1 Carbon 6th systems
  soc: imx: gpc: restrict register range for regmap access
  tcp: identify cryptic messages as TCP seq # bugs
  net: qca_spi: Fix log level if probe fails
  net: qca_spi: Make sure the QCA7000 reset is triggered
  net: qca_spi: Avoid packet drop during initial sync
  PCI: versatile: Fix I/O space page leak
  PCI: OF: Fix I/O space page leak
  kvmclock: fix TSC calibration for nested guests
  net: usb: rtl8150: demote allmulti message to dev_dbg()
  octeon_mgmt: Fix MIX registers configuration on MTU setup
  btrfs: scrub: Don't use inode page cache in scrub_handle_errored_block()
  ibmvnic: Fix error recovery on login failure
  net/ethernet/freescale/fman: fix cross-build error
  hv/netvsc: fix handling of fallback to single queue mode
  drm/nouveau/gem: off by one bugs in nouveau_gem_pushbuf_reloc_apply()
  pinctrl: nsp: Fix potential NULL dereference
  pinctrl: nsp: off by ones in nsp_pinmux_enable()
  pinctrl: ingenic: Fix inverted direction for < JZ4770
  tcp: remove DELAYED ACK events in DCTCP
  qlogic: check kstrtoul() for errors
  packet: reset network header if packet shorter than ll reserved space
  kbuild: suppress warnings from 'getconf LFS_*'
  tools: build: Use HOSTLDFLAGS with fixdep
  ixgbe: Be more careful when modifying MAC filters
  ARM: dts: am3517.dtsi: Disable reference to OMAP3 OTG controller
  ARM: DRA7/OMAP5: Enable ACTLR[0] (Enable invalidates of BTB) for secondary cores
  ARM: 8780/1: ftrace: Only set kernel memory back to read-only after boot
  RDMA/mlx5: Fix memory leak in mlx5_ib_create_srq() error path
  nfit: fix unchecked dereference in acpi_nfit_ctl
  perf script python: Fix dict reference counting
  perf tools: Fix compilation errors on gcc8
  perf llvm-utils: Remove bashism from kernel include fetch script
  scsi: qedi: Send driver state to MFW
  scsi: qedf: Send the driver state to MFW
  bnxt_en: Fix for system hang if request_irq fails
  bnxt_en: Always set output parameters in bnxt_get_max_rings().
  bnxt_en: Fix inconsistent BNXT_FLAG_AGG_RINGS logic.
  ARC: Improve cmpxchg syscall implementation
  netfilter: nf_conntrack: Fix possible possible crash on module loading.
  netfilter: nft_compat: explicitly reject ERROR and standard target
  drm/armada: fix irq handling
  drm/armada: fix colorkey mode property
  drm/tegra: Fix comparison operator for buffer size
  gpu: host1x: Check whether size of unpin isn't 0
  ieee802154: fakelb: switch from BUG_ON() to WARN_ON() on problem
  ieee802154: at86rf230: use __func__ macro for debug messages
  ieee802154: at86rf230: switch from BUG_ON() to WARN_ON() on problem
  nvmem: Don't let a NULL cell_id for nvmem_cell_get() crash us
  net/sched: act_tunnel_key: fix NULL dereference when 'goto chain' is used
  ARM: pxa: irq: fix handling of ICMR registers in suspend/resume
  ravb: fix invalid context bug while changing link options by ethtool
  ravb: fix invalid context bug while calling auto-negotiation by ethtool
  sh_eth: fix invalid context bug while changing link options by ethtool
  sh_eth: fix invalid context bug while calling auto-negotiation by ethtool
  net: qrtr: Broadcast messages only from control port
  ipv6: make ipv6_renew_options() interrupt/kernel safe
  netfilter: x_tables: set module owner for icmp(6) matches
  ieee802154: 6lowpan: set IFLA_LINK
  samples/bpf: Check the error of write() and read()
  samples/bpf: Check the result of system()
  samples/bpf: add missing <linux/if_vlan.h>
  drm/bridge/sii8620: Fix display of packed pixel modes
  smsc75xx: Add workaround for gigabit link up hardware errata.
  kasan: fix shadow_size calculation error in kasan_module_alloc
  tracing: Use __printf markup to silence compiler
  bpf: hash map: decrement counter on error
  ARM: imx_v4_v5_defconfig: Select ULPI support
  ARM: imx_v6_v7_defconfig: Select ULPI support
  HID: wacom: Correct touch maximum XY of 2nd-gen Intuos
  x86/mm/32: Initialize the CR4 shadow before __flush_tlb_all()
  drm/amdgpu: fix swapped emit_ib_size in vce3
  ipvlan: call dev_change_flags when ipvlan mode is reset
  objtool: Support GCC 8 '-fnoreorder-functions'
  m68k: fix "bad page state" oops on ColdFire boot
  openrisc: entry: Fix delay slot exception detection
  acpi/nfit: fix cmd_rc for acpi_nfit_ctl to always return a value
  dpaa_eth: DPAA SGT needs to be 256B
  fsl/fman: fix parser reporting bad checksum on short frames
  bnx2x: Fix receiving tx-timeout in error or recovery state.
  PCI: faraday: Add missing of_node_put()
  PCI: xilinx-nwl: Add missing of_node_put()
  PCI: xilinx: Add missing of_node_put()
  bpf, s390: fix potential memleak when later bpf_jit_prog fails
  drbd: Fix drbd_request_prepare() discard handling
  drm/exynos: decon5433: Fix WINCONx reset value
  drm/exynos: decon5433: Fix per-plane global alpha for XRGB modes
  drm/exynos: gsc: Fix support for NV16/61, YUV420/YVU420 and YUV422 modes
  nl80211: check nla_parse_nested() return values
  nl80211: relax ht operation checks for mesh
  dev-dax: check_vma: ratelimit dev_info-s
  md/raid10: fix that replacement cannot complete recovery after reassemble
  ath10k: update the phymode along with bandwidth change request
  dmaengine: k3dma: Off by one in k3_of_dma_simple_xlate()
  dmaengine: pl330: report BURST residue granularity
  ARM64: dts: meson-gxl: fix Mali GPU compatible string
  ARM: dts: da850: Fix interrups property for gpio
  selftests/x86/sigreturn: Do minor cleanups
  selftests/x86/sigreturn/64: Fix spurious failures on AMD CPUs
  nfp: cast sizeof() to int when comparing with error code
  net/mlx5: E-Switch, Disallow vlan/spoofcheck setup if not being esw manager
  ceph: fix dentry leak in splice_dentry()
  netfilter: nf_log: fix uninit read in nf_log_proc_dostring
  ARM: davinci: board-da850-evm: fix WP pin polarity for MMC/SD
  perf bench: Fix numa report output code
  perf tools: Fix a clang 7.0 compilation error
  perf report powerpc: Fix crash if callchain is empty
  perf test session topology: Fix test on s390
  perf record: Support s390 random socket_id assignment
  kconfig: fix line numbers for if-entries in menu tree
  typec: tcpm: Fix a msecs vs jiffies bug
  NFC: pn533: Fix wrong GFP flag usage
  usb: xhci: increase CRS timeout value
  usb: xhci: remove the code build warning
  ALSA: seq: Fix UBSAN warning at SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT ioctl
  ARM: dts: am437x: make edt-ft5x06 a wakeup source
  brcmfmac: stop watchdog before detach and free everything
  iio: pressure: bmp280: fix relative humidity unit
  cxgb4: when disabling dcb set txq dcb priority to 0
  batman-adv: Fix multicast TT issues with bogus ROAM flags
  batman-adv: Avoid storing non-TT-sync flags on singular entries too
  batman-adv: Fix bat_v best gw refcnt after netlink dump
  batman-adv: Fix bat_ogm_iv best gw refcnt after netlink dump
  arm64: dts: msm8916: fix Coresight ETF graph connections
  Smack: Mark inode instant in smack_task_to_inode
  ipv6: mcast: fix unsolicited report interval after receiving querys
  x86/microcode/intel: Fix memleak in save_microcode_patch()
  mtd: dataflash: Use ULL suffix for 64-bit constants
  selftests: bpf: notification about privilege required to run test_kmod.sh testing script
  locking/lockdep: Do not record IRQ state within lockdep code
  drm/bridge/sii8620: fix display of packed pixel modes in MHL2
  KVM: arm/arm64: Drop resource size check for GICV window
  sctp: fix erroneous inc of snmp SctpFragUsrMsgs
  net: davinci_emac: match the mdio device against its compatible if possible
  nbd: Add the nbd NBD_DISCONNECT_ON_CLOSE config flag.
  ARC: Enable machine_desc->init_per_cpu for !CONFIG_SMP
  block: sed-opal: Fix a couple off by one bugs
  nvmet: reset keep alive timer in controller enable
  net: stmmac: socfpga: add additional ocp reset line for Stratix10
  net: propagate dev_get_valid_name return code
  net: hamradio: use eth_broadcast_addr
  enic: initialize enic->rfs_h.lock in enic_probe
  qed: Do not advertise DCBX_LLD_MANAGED capability.
  qed: Add sanity check for SIMD fastpath handler.
  qed: Fix possible memory leak in Rx error path handling.
  arm64: make secondary_start_kernel() notrace
  arm64: dma-mapping: clear buffers allocated with FORCE_CONTIGUOUS flag
  xen/scsiback: add error handling for xenbus_printf
  scsi: xen-scsifront: add error handling for xenbus_printf
  pNFS: Always free the session slot on error in nfs4_layoutget_handle_exception
  xen: add error handling for xenbus_printf
  dwc2: gadget: Fix ISOC IN DDMA PID bitfield value calculation
  usb: gadget: dwc2: fix memory leak in gadget_init()
  usb: gadget: composite: fix delayed_status race condition when set_interface
  usb: dwc2: fix isoc split in transfer with no data
  usb: dwc2: alloc dma aligned buffer for isoc split in
  libahci: Fix possible Spectre-v1 pmp indexing in ahci_led_store()
  IB/rxe: Fix missing completion for mem_reg work requests
  drm/arm/malidp: Preserve LAYER_FORMAT contents when setting format
  drm: mali-dp: Enable Global SE interrupts mask for DP500
  drivers/perf: xgene_pmu: Fix IOB SLOW PMU parser error
  arm64: dts: Stingray: Fix I2C controller interrupt type
  arm64: dts: ns2: Fix PCIe controller interrupt type
  arm64: dts: ns2: Fix I2C controller interrupt type
  arm64: dts: specify 1.8V EMMC capabilities for bcm958742t
  arm64: dts: specify 1.8V EMMC capabilities for bcm958742k
  ARM: dts: Cygnus: Fix PCIe controller interrupt type
  ARM: dts: Cygnus: Fix I2C controller interrupt type
  ARM: dts: BCM5301x: Fix i2c controller interrupt type
  ARM: dts: NSP: Fix PCIe controllers interrupt types
  ARM: dts: NSP: Fix i2c controller interrupt type
  selftests: sync: add config fragment for testing sync framework
  selftests: vm: return Kselftest Skip code for skipped tests
  selftests: zram: return Kselftest Skip code for skipped tests
  selftests: user: return Kselftest Skip code for skipped tests
  selftests: sysctl: return Kselftest Skip code for skipped tests
  selftests: static_keys: return Kselftest Skip code for skipped tests
  selftests: pstore: return Kselftest Skip code for skipped tests
  netfilter: nf_ct_helper: Fix possible panic after nf_conntrack_helper_unregister
  netfilter: ipv6: nf_defrag: reduce struct net memory waste
  ACPI / EC: Use ec_no_wakeup on Thinkpad X1 Carbon 6th
  usb: dwc3: of-simple: fix use-after-free on remove
  usb: dwc2: gadget: Fix issue in dwc2_gadget_start_isoc()
  usb: gadget: ffs: Fix BUG when userland exits with submitted AIO transfers
  usb: dwc3: pci: add support for Intel IceLake
  soc: imx: gpcv2: correct PGC offset
  hwmon: (nct6775) Fix loop limit
  ARC: Explicitly add -mmedium-calls to CFLAGS
  drm/bridge/sii8620: fix potential buffer overflow
  drm/bridge/sii8620: fix loops in EDID fetch logic
  IB/mlx4: Fix an error handling path in 'mlx4_ib_rereg_user_mr()'
  Input: synaptics-rmi4 - fix axis-swap behavior
  perf tools: Fix error index for pmu event parser
  vfio: ccw: fix error return in vfio_ccw_sch_event
  arm: dts: armada: Fix "#cooling-cells" property's name
  pty: fix O_CLOEXEC for TIOCGPTPEER
  EDAC: Add missing MEM_LRDDR4 entry in edac_mem_types[]
  drm/i915/kvmgt: Fix potential Spectre v1
  ext4: fix spectre gadget in ext4_mb_regular_allocator()

Conflicts:
	drivers/usb/gadget/function/f_fs.c
	net/qrtr/qrtr.c

Change-Id: I52226cb0e1405455b7e11255f1620d5e5fdfe916
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 6a734e2c 75ac55a8

Makefile

+4 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 66

SUBLEVEL = 67

EXTRAVERSION =

NAME = Petit Gorille
@@ -357,9 +357,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ 
	  else if [ -x /bin/bash ]; then echo /bin/bash; \

	  else echo sh; fi ; fi)



HOST_LFS_CFLAGS := $(shell getconf LFS_CFLAGS)

HOST_LFS_LDFLAGS := $(shell getconf LFS_LDFLAGS)

HOST_LFS_LIBS := $(shell getconf LFS_LIBS)

HOST_LFS_CFLAGS := $(shell getconf LFS_CFLAGS 2>/dev/null)

HOST_LFS_LDFLAGS := $(shell getconf LFS_LDFLAGS 2>/dev/null)

HOST_LFS_LIBS := $(shell getconf LFS_LIBS 2>/dev/null)



HOSTCC       = gcc

HOSTCXX      = g++

arch/arc/Makefile

+1 −14
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ endif 


KBUILD_DEFCONFIG := nsim_700_defconfig



cflags-y	+= -fno-common -pipe -fno-builtin -D__linux__

cflags-y	+= -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__

cflags-$(CONFIG_ISA_ARCOMPACT)	+= -mA7

cflags-$(CONFIG_ISA_ARCV2)	+= -mcpu=archs
@@ -140,16 +140,3 @@ dtbs: scripts 


archclean:

	$(Q)$(MAKE) $(clean)=$(boot)
 


# Hacks to enable final link due to absence of link-time branch relexation

# and gcc choosing optimal(shorter) branches at -O3

#

# vineetg Feb 2010: -mlong-calls switched off for overall kernel build

# However lib/decompress_inflate.o (.init.text) calls

# zlib_inflate_workspacesize (.text) causing relocation errors.

# Thus forcing all exten calls in this file to be long calls

export CFLAGS_decompress_inflate.o = -mmedium-calls

export CFLAGS_initramfs.o = -mmedium-calls

ifdef CONFIG_SMP

export CFLAGS_core.o = -mmedium-calls

endif

arch/arc/include/asm/mach_desc.h

+0 −2
Original line number Diff line number Diff line
@@ -34,9 +34,7 @@ struct machine_desc { 
	const char		*name;

	const char		**dt_compat;

	void			(*init_early)(void);

#ifdef CONFIG_SMP

	void			(*init_per_cpu)(unsigned int);

#endif

	void			(*init_machine)(void);

	void			(*init_late)(void);

arch/arc/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ void __init init_IRQ(void) 
	/* a SMP H/w block could do IPI IRQ request here */

	if (plat_smp_ops.init_per_cpu)

		plat_smp_ops.init_per_cpu(smp_processor_id());

#endif



	if (machine_desc->init_per_cpu)

		machine_desc->init_per_cpu(smp_processor_id());

#endif

}



/*

arch/arc/kernel/process.c

+36 −11
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ SYSCALL_DEFINE0(arc_gettls) 
SYSCALL_DEFINE3(arc_usr_cmpxchg, int *, uaddr, int, expected, int, new)

{

	struct pt_regs *regs = current_pt_regs();

	int uval = -EFAULT;

	u32 uval;

	int ret;



	/*

	 * This is only for old cores lacking LLOCK/SCOND, which by defintion
@@ -60,23 +61,47 @@ SYSCALL_DEFINE3(arc_usr_cmpxchg, int *, uaddr, int, expected, int, new) 
	/* Z indicates to userspace if operation succeded */

	regs->status32 &= ~STATUS_Z_MASK;



	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))

		return -EFAULT;

	ret = access_ok(VERIFY_WRITE, uaddr, sizeof(*uaddr));

	if (!ret)

		 goto fail;



again:

	preempt_disable();



	if (__get_user(uval, uaddr))

		goto done;

	ret = __get_user(uval, uaddr);

	if (ret)

		 goto fault;



	if (uval != expected)

		 goto out;



	ret = __put_user(new, uaddr);

	if (ret)

		 goto fault;



	if (uval == expected) {

		if (!__put_user(new, uaddr))

	regs->status32 |= STATUS_Z_MASK;

	}



done:

out:

	preempt_enable();



	return uval;



fault:

	preempt_enable();



	if (unlikely(ret != -EFAULT))

		 goto fail;



	down_read(&current->mm->mmap_sem);

	ret = fixup_user_fault(current, current->mm, (unsigned long) uaddr,

			       FAULT_FLAG_WRITE, NULL);

	up_read(&current->mm->mmap_sem);



	if (likely(!ret))

		 goto again;



fail:

	force_sig(SIGSEGV, current);

	return ret;

}



#ifdef CONFIG_ISA_ARCV2