Commit 27031678 authored Feb 27, 2019 by Ivaylo Georgiev

Merge android-4.19.16 (976f78d5) into msm-4.19



* refs/heads/tmp-976f78d5:
  Linux 4.19.16
  Btrfs: use nofs context when initializing security xattrs to avoid deadlock
  Btrfs: fix deadlock when enabling quotas due to concurrent snapshot creation
  Btrfs: fix access to available allocation bits when starting balance
  arm64: compat: Don't pull syscall number from regs in arm_compat_syscall
  KVM: arm/arm64: Fix VMID alloc race by reverting to lock-less
  sunrpc: use-after-free in svc_process_common()
  mm: page_mapped: don't assume compound page is huge or THP
  ext4: fix special inode number checks in __ext4_iget()
  ext4: track writeback errors using the generic tracking infrastructure
  ext4: use ext4_write_inode() when fsyncing w/o a journal
  ext4: avoid kernel warning when writing the superblock to a dead device
  ext4: fix a potential fiemap/page fault deadlock w/ inline_data
  ext4: make sure enough credits are reserved for dioread_nolock writes
  rbd: don't return 0 on unmap if RBD_DEV_FLAG_REMOVING is set
  drm/amdgpu: Don't fail resume process if resuming atomic state fails
  drm/amdgpu: Don't ignore rc from drm_dp_mst_topology_mgr_resume()
  drm/i915: Unwind failure on pinning the gen7 ppgtt
  drm/fb-helper: Partially bring back workaround for bugs of SDL 1.2
  drm/fb_helper: Allow leaking fbdev smem_start
  drm/amd/display: Fix MST dp_blank REG_WAIT timeout
  PCI: dwc: Move interrupt acking into the proper callback
  PCI: dwc: Take lock when ACKing an interrupt
  PCI: dwc: Use interrupt masking instead of disabling
  drm/amdgpu: Add new VegaM pci id
  vfio/type1: Fix unmap overflow off-by-one
  mtd: rawnand: qcom: fix memory corruption that causes panic
  i2c: dev: prevent adapter retries and timeout being set as minus value
  ACPI/IORT: Fix rc_dma_get_range()
  ACPI / PMIC: xpower: Fix TS-pin current-source handling
  ACPI: power: Skip duplicate power resource references in _PRx
  mm, memcg: fix reclaim deadlock with writeback
  mm/usercopy.c: no check page span for stack objects
  slab: alien caches must not be initialized if the allocation of the alien cache failed
  USB: Add USB_QUIRK_DELAY_CTRL_MSG quirk for Corsair K70 RGB
  USB: storage: add quirk for SMI SM3350
  USB: storage: don't insert sane sense for SPC3+ when bad sense specified
  usb: cdc-acm: send ZLP for Telit 3G Intel based modems
  cifs: Fix potential OOB access of lock element array
  CIFS: Fix credit computation for compounded requests
  CIFS: Do not hide EINTR after sending network packets
  CIFS: Do not set credits to 1 if the server didn't grant anything
  CIFS: Fix adjustment of credits for MTU requests
  ALSA: hda/realtek - Disable headset Mic VREF for headset mode of ALC225
  ALSA: hda/realtek - Add unplug function into unplug state of Headset Mode for ALC225
  ALSA: hda/realtek - Support Dell headset mode for New AIO platform
  x86, modpost: Replace last remnants of RETPOLINE with CONFIG_RETPOLINE
  cpufreq: scmi: Fix frequency invariance in slow path
  staging: rtl8188eu: Fix module loading from tasklet for WEP encryption
  staging: rtl8188eu: Fix module loading from tasklet for CCMP encryption
  Btrfs: fix deadlock when using free space tree due to block group creation
  UPSTREAM: selftests/memfd: Add tests for F_SEAL_FUTURE_WRITE seal
  UPSTREAM: mm/memfd: Add an F_SEAL_FUTURE_WRITE seal to memfd
  Revert "UPSTREAM: mm: Add an F_SEAL_FUTURE_WRITE seal to memfd"
  Revert "UPSTREAM: mm/memfd: make F_SEAL_FUTURE_WRITE seal more robust"
  ANDROID: cuttlefish: enable CONFIG_NET_CLS_BPF=y
  Makefile: Fix 4.19.15 resolution
  ANDROID: f2fs: Complement "android_fs" tracepoint of read path

Change-Id: I9c9c1f53796798b4ac1038dcfcf0d70624c1cfca
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>

parents ffb1bfc2 976f78d5

Makefile

+3 −4

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 19
		SUBLEVEL = 15
		SUBLEVEL = 16
		EXTRAVERSION =
		NAME = "People's Front"

		@@ -487,11 +487,10 @@ endif
		ifeq ($(cc-name),clang)
		ifneq ($(CROSS_COMPILE),)
		CLANG_TRIPLE ?= $(CROSS_COMPILE)
		CLANG_TARGET := --target=$(notdir $(CLANG_TRIPLE:%-=%))
		ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_TARGET)), y)
		CLANG_FLAGS := --target=$(notdir $(CLANG_TRIPLE:%-=%))
		ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)
		$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")
		endif
		CLANG_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%))
		GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))
		CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)
		GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)

arch/arm64/configs/cuttlefish_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -178,6 +178,7 @@ CONFIG_L2TP=y
		CONFIG_NET_SCHED=y
		CONFIG_NET_SCH_HTB=y
		CONFIG_NET_CLS_U32=y
		CONFIG_NET_CLS_BPF=y
		CONFIG_NET_EMATCH=y
		CONFIG_NET_EMATCH_U32=y
		CONFIG_NET_CLS_ACT=y

arch/arm64/kernel/sys_compat.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -66,12 +66,11 @@ do_compat_cache_op(unsigned long start, unsigned long end, int flags)
		/*
		* Handle all unrecognised system calls.
		*/
		long compat_arm_syscall(struct pt_regs *regs)
		long compat_arm_syscall(struct pt_regs *regs, int scno)
		{
		siginfo_t info;
		unsigned int no = regs->regs[7];

		switch (no) {
		switch (scno) {
		/*
		* Flush a region from virtual address 'r0' to virtual address 'r1'
		* _exclusive_. There is no alignment requirement on either address;
		@@ -107,7 +106,7 @@ long compat_arm_syscall(struct pt_regs *regs)
		* way the calling program can gracefully determine whether
		* a feature is supported.
		*/
		if (no < __ARM_NR_COMPAT_END)
		if (scno < __ARM_NR_COMPAT_END)
		return -ENOSYS;
		break;
		}
		@@ -119,6 +118,6 @@ long compat_arm_syscall(struct pt_regs *regs)
		info.si_addr = (void __user *)instruction_pointer(regs) -
		(compat_thumb_mode(regs) ? 2 : 4);

		arm64_notify_die("Oops - bad compat syscall(2)", regs, &info, no);
		arm64_notify_die("Oops - bad compat syscall(2)", regs, &info, scno);
		return 0;
		}

arch/arm64/kernel/syscall.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -13,16 +13,15 @@
		#include <asm/thread_info.h>
		#include <asm/unistd.h>

		long compat_arm_syscall(struct pt_regs *regs);

		long compat_arm_syscall(struct pt_regs *regs, int scno);
		long sys_ni_syscall(void);

		asmlinkage long do_ni_syscall(struct pt_regs *regs)
		static long do_ni_syscall(struct pt_regs *regs, int scno)
		{
		#ifdef CONFIG_COMPAT
		long ret;
		if (is_compat_task()) {
		ret = compat_arm_syscall(regs);
		ret = compat_arm_syscall(regs, scno);
		if (ret != -ENOSYS)
		return ret;
		}
		@@ -47,7 +46,7 @@ static void invoke_syscall(struct pt_regs *regs, unsigned int scno,
		syscall_fn = syscall_table[array_index_nospec(scno, sc_nr)];
		ret = __invoke_syscall(regs, syscall_fn);
		} else {
		ret = do_ni_syscall(regs);
		ret = do_ni_syscall(regs, scno);
		}

		regs->regs[0] = ret;

arch/x86/configs/x86_64_cuttlefish_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -183,6 +183,7 @@ CONFIG_IP6_NF_RAW=y
		CONFIG_NET_SCHED=y
		CONFIG_NET_SCH_HTB=y
		CONFIG_NET_CLS_U32=y
		CONFIG_NET_CLS_BPF=y
		CONFIG_NET_EMATCH=y
		CONFIG_NET_EMATCH_U32=y
		CONFIG_NET_CLS_ACT=y