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

Commit d9a87945 authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android-4.4.158 (f9e41343) into msm-4.4 



* refs/heads/tmp-f9e41343
  Linux 4.4.158
  MIPS: VDSO: Match data page cache colouring when D$ aliases
  drivers: net: cpsw: fix segfault in case of bad phy-handle
  mei: bus: type promotion bug in mei_nfc_if_version()
  USB: serial: ti_usb_3410_5052: fix array underflow in completion handler
  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
  gpiolib: Mark gpio_suffixes array with __maybe_unused
  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
  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
  MIPS: loongson64: cs5536: Fix PCI_OHCI_INT_REG reads
  mtdchar: fix overflows in adjustment of `count`
  audit: fix use-after-free in audit_add_watch
  binfmt_elf: Respect error return from `regset->active'
  CIFS: fix wrapping bugs in num_entries()
  cifs: prevent integer overflow in nxt_dir_entry()
  usb: cdc-wdm: Fix a sleep-in-atomic-context bug in service_outstanding_interrupt()
  USB: yurex: Fix buffer over-read in yurex_write()
  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: 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: Add quirk to support DJI CineSSD
  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
  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
  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
  arm64: dts: qcom: db410c: Fix Bluetooth LED trigger
  xen-netfront: fix queue name setting
  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
  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()
  mtd/maps: fix solutionengine.c printk format warnings
  media: videobuf2-core: check for q->error in vb2_core_qbuf()
  MIPS: ath79: fix system restart
  dmaengine: pl330: fix irq race with terminate_all
  kbuild: add .DELETE_ON_ERROR special target
  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
  BACKPORT: arm/syscalls: Optimize address limit check
  UPSTREAM: syscalls: Use CHECK_DATA_CORRUPTION for addr_limit_user_check
  BACKPORT: 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
  BACKPORT: 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()
  BACKPORT: list: Split list_add() debug checking into separate function
  FROMLIST: ANDROID: binder: Add BINDER_GET_NODE_INFO_FOR_REF ioctl.

Conflicts:
	include/linux/bug.h
	lib/Kconfig.debug
	lib/list_debug.c

Change-Id: I9d87b6b133cac5b642e5e0c928e0bcd0eda6fbdb
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents 96373042 f9e41343

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 157

SUBLEVEL = 158

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/boot/dts/qcom/apq8016-sbc.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ 
			led@6 {

				label = "apq8016-sbc:blue:bt";

				gpios = <&pm8916_mpps 3 GPIO_ACTIVE_HIGH>;

				linux,default-trigger = "bt";

				linux,default-trigger = "bluetooth-power";

				default-state = "off";

			};

		};

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
@@ -260,6 +260,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;

	}