Commit 2e316b4a authored Nov 07, 2018 by Minming Qi

Merge android-4.9.129 (b727d1c1) into msm-4.9



* refs/heads/tmp-b727d1c1:
  Linux 4.9.129
  e1000e: Fix link check race condition
  Revert "e1000e: Separate signaling for link check/link up"
  e1000e: Avoid missed interrupts following ICR read
  e1000e: Fix queue interrupt re-raising in Other interrupt
  Partial revert "e1000e: Avoid receiver overrun interrupt bursts"
  e1000e: Remove Other from EIAC
  MIPS: VDSO: Match data page cache colouring when D$ aliases
  mei: bus: type promotion bug in mei_nfc_if_version()
  pinctrl: qcom: spmi-gpio: Fix pmic_gpio_config_get() to be compliant
  drm/panel: type promotion bug in s6e8aa0_read_mtp_id()
  selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress
  ALSA: pcm: Fix snd_interval_refine first/last with open min/max
  rtc: bq4802: add error handling for devm_ioremap
  drm/amdkfd: Fix error codes in kfd_get_process
  input: rohm_bu21023: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT)
  mfd: 88pm860x-i2c: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT)
  gpiolib: Mark gpio_suffixes array with __maybe_unused
  gpio: pxa: Fix potential NULL dereference
  coresight: tpiu: Fix disabling timeouts
  coresight: Handle errors in finding input/output ports
  parport: sunbpp: fix error return code
  drm/nouveau: tegra: Detach from ARM DMA/IOMMU mapping
  mmc: sdhci: do not try to use 3.3V signaling if not supported
  mmc: tegra: prevent HS200 on Tegra 3
  gpu: ipu-v3: csi: pass back mbus_code_to_bus_cfg error codes
  ARM: hisi: check of_iomap and fix missing of_node_put
  ARM: hisi: fix error handling and missing of_node_put
  ARM: hisi: handle of_iomap and fix missing of_node_put
  efi/esrt: Only call efi_mem_reserve() for boot services memory
  configfs: fix registered group removal
  MIPS: loongson64: cs5536: Fix PCI_OHCI_INT_REG reads
  evm: Don't deadlock if a crypto algorithm is unavailable
  mtdchar: fix overflows in adjustment of `count`
  audit: fix use-after-free in audit_add_watch
  binfmt_elf: Respect error return from `regset->active'
  NFSv4.1 fix infinite loop on I/O.
  perf/core: Force USER_DS when recording user stack data
  CIFS: fix wrapping bugs in num_entries()
  cifs: prevent integer overflow in nxt_dir_entry()
  Revert "cdc-acm: implement put_char() and flush_chars()"
  usb: cdc-wdm: Fix a sleep-in-atomic-context bug in service_outstanding_interrupt()
  USB: yurex: Fix buffer over-read in yurex_write()
  USB: serial: ti_usb_3410_5052: fix array underflow in completion handler
  usb: misc: uss720: Fix two sleep-in-atomic-context bugs
  USB: serial: io_ti: fix array underflow in completion handler
  USB: net2280: Fix erroneous synchronization change
  usb: gadget: udc: renesas_usb3: fix maxpacket size of ep0
  USB: add quirk for WORLDE Controller KS49 or Prodipe MIDI 49C USB controller
  usb: host: u132-hcd: Fix a sleep-in-atomic-context bug in u132_get_frame()
  usb: Avoid use-after-free by flushing endpoints early in usb_set_interface()
  usb: uas: add support for more quirk flags
  USB: Add quirk to support DJI CineSSD
  mei: ignore not found client in the enumeration
  usb: Don't die twice if PCI xhci host is not responding in resume
  misc: hmc6352: fix potential Spectre v1
  Tools: hv: Fix a bug in the key delete code
  mmc: omap_hsmmc: fix wakeirq handling on removal
  IB/ipoib: Avoid a race condition between start_xmit and cm_rep_handler
  xen/netfront: fix waiting for xenbus state change
  pstore: Fix incorrect persistent ram buffer mapping
  RDMA/cma: Protect cma dev list with lock
  xen-netfront: fix warn message as irq device name has '/'
  crypto: sharah - Unregister correct algorithms for SAHARA 3
  dmaengine: mv_xor_v2: kill the tasklets upon exit
  drivers/base: stop new probing during shutdown
  KVM: arm/arm64: Fix vgic init race
  platform/x86: toshiba_acpi: Fix defined but not used build warnings
  s390/qeth: reset layer2 attribute on layer switch
  s390/qeth: fix race in used-buffer accounting
  ARM: dts: qcom: msm8974-hammerhead: increase load on l20 for sdhci
  arm64: dts: qcom: db410c: Fix Bluetooth LED trigger
  xen-netfront: fix queue name setting
  nfp: avoid buffer leak when FW communication fails
  efi/arm: preserve early mapping of UEFI memory map longer for BGRT
  wan/fsl_ucc_hdlc: use IS_ERR_VALUE() to check return value of qe_muram_alloc
  Smack: Fix handling of IPv4 traffic received by PF_INET6 sockets
  mac80211: restrict delayed tailroom needed decrement
  MIPS: jz4740: Bump zload address
  powerpc/powernv: opal_put_chars partial write fix
  perf powerpc: Fix callchain ip filtering
  ARM: exynos: Clear global variable on init error path
  fbdev: Distinguish between interlaced and progressive modes
  video: fbdev: pxafb: clear allocated memory for video modes
  perf powerpc: Fix callchain ip filtering when return address is in a register
  fbdev/via: fix defined but not used warning
  video: goldfishfb: fix memory leak on driver remove
  fbdev: omapfb: off by one in omapfb_register_client()
  gfs2: Don't reject a supposedly full bitmap if we have blocks reserved
  perf test: Fix subtest number when showing results
  mtd/maps: fix solutionengine.c printk format warnings
  IB/rxe: Drop QP0 silently
  media: videobuf2-core: check for q->error in vb2_core_qbuf()
  MIPS: ath79: fix system restart
  dmaengine: pl330: fix irq race with terminate_all
  media: tw686x: Fix oops on buffer alloc failure
  kbuild: add .DELETE_ON_ERROR special target
  clk: clk-fixed-factor: Clear OF_POPULATED flag in case of failure
  clk: imx6ul: fix missing of_node_put()
  gfs2: Special-case rindex for gfs2_grow
  xfrm: fix 'passing zero to ERR_PTR()' warning
  ALSA: usb-audio: Fix multiple definitions in AU0828_DEVICE() macro
  ALSA: msnd: Fix the default sample sizes
  iommu/arm-smmu-v3: sync the OVACKFLG to PRIQ consumer register
  net/mlx5: Fix debugfs cleanup in the device init/remove flow
  net/mlx5: Fix use-after-free in self-healing flow
  rds: fix two RCU related problems
  be2net: Fix memory leak in be_cmd_get_profile_config()
  UPSTREAM: arm64/syscalls: Move address limit check in loop
  BACKPORT: arm/syscalls: Optimize address limit check
  UPSTREAM: syscalls: Use CHECK_DATA_CORRUPTION for addr_limit_user_check
  UPSTREAM: arm64/syscalls: Check address limit on user-mode return
  BACKPORT: x86/syscalls: Check address limit on user-mode return
  BACKPORT: lkdtm: add bad USER_DS test
  UPSTREAM: bug: switch data corruption check to __must_check
  UPSTREAM: lkdtm: Add tests for struct list corruption
  UPSTREAM: bug: Provide toggle for BUG on data corruption
  UPSTREAM: list: Split list_del() debug checking into separate function
  UPSTREAM: rculist: Consolidate DEBUG_LIST for list_add_rcu()
  UPSTREAM: list: Split list_add() debug checking into separate function
  FROMLIST: ANDROID: binder: Add BINDER_GET_NODE_INFO_FOR_REF ioctl.

Conflicts:
	drivers/misc/lkdtm.h
	drivers/misc/lkdtm_bugs.c
	drivers/misc/lkdtm_core.c
	include/linux/bug.h
	lib/Kconfig.debug
	lib/list_debug.c

Change-Id: I599369f47c3695545470d1ae6069f58728cd61f3
Signed-off-by: Minming Qi <mqi@codeaurora.org>

parents a80f4c8c b727d1c1

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 128
		SUBLEVEL = 129
		EXTRAVERSION =
		NAME = Roaring Lionus

arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts

+2 −0

Original line number	Diff line number	Diff line
		@@ -188,6 +188,8 @@
		regulator-max-microvolt = <2950000>;

		regulator-boot-on;
		regulator-system-load = <200000>;
		regulator-allow-set-load;
		};

		l21 {

arch/arm/kernel/entry-common.S

+10 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		#include <asm/unistd.h>
		#include <asm/ftrace.h>
		#include <asm/unwind.h>
		#include <asm/memory.h>

		#ifdef CONFIG_NEED_RET_TO_USER
		#include <mach/entry-macro.S>
		@@ -35,6 +36,9 @@ ret_fast_syscall:
		UNWIND(.fnstart )
		UNWIND(.cantunwind )
		disable_irq_notrace @ disable interrupts
		ldr r2, [tsk, #TI_ADDR_LIMIT]
		cmp r2, #TASK_SIZE
		blne addr_limit_check_failed
		ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing
		tst r1, #_TIF_SYSCALL_WORK \| _TIF_WORK_MASK
		bne fast_work_pending
		@@ -61,6 +65,9 @@ ret_fast_syscall:
		UNWIND(.cantunwind )
		str r0, [sp, #S_R0 + S_OFF]! @ save returned r0
		disable_irq_notrace @ disable interrupts
		ldr r2, [tsk, #TI_ADDR_LIMIT]
		cmp r2, #TASK_SIZE
		blne addr_limit_check_failed
		ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing
		tst r1, #_TIF_SYSCALL_WORK \| _TIF_WORK_MASK
		beq no_work_pending
		@@ -93,6 +100,9 @@ ENTRY(ret_to_user)
		ret_slow_syscall:
		disable_irq_notrace @ disable interrupts
		ENTRY(ret_to_user_from_irq)
		ldr r2, [tsk, #TI_ADDR_LIMIT]
		cmp r2, #TASK_SIZE
		blne addr_limit_check_failed
		ldr r1, [tsk, #TI_FLAGS]
		tst r1, #_TIF_WORK_MASK
		bne slow_work_pending

arch/arm/kernel/signal.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		#include <linux/uaccess.h>
		#include <linux/tracehook.h>
		#include <linux/uprobes.h>
		#include <linux/syscalls.h>

		#include <asm/elf.h>
		#include <asm/cacheflush.h>
		@@ -631,3 +632,9 @@ struct page *get_signal_page(void)

		return page;
		}

		/* Defer to generic check */
		asmlinkage void addr_limit_check_failed(void)
		{
		addr_limit_user_check();
		}

arch/arm/mach-exynos/suspend.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -252,6 +252,7 @@ static int __init exynos_pmu_irq_init(struct device_node *node,
		NULL);
		if (!domain) {
		iounmap(pmu_base_addr);
		pmu_base_addr = NULL;
		return -ENOMEM;
		}