Commit dd975756 authored Aug 07, 2019 by jianzhou

Merge android-4.9.185 (70d52cb2) into msm-4.9



* refs/heads/tmp-70d52cb2:
  Linux 4.9.185
  arm64: kaslr: keep modules inside module region when KASAN is enabled
  dmaengine: imx-sdma: remove BD_INTR for channel0
  MIPS: Add missing EHB in mtc0 -> mfc0 sequence.
  IB/hfi1: Close PSM sdma_progress sleep window
  KVM: LAPIC: Fix pending interrupt in IRR blocked by software disable LAPIC
  arm64, vdso: Define vdso_{start,end} as array
  tty: rocket: fix incorrect forward declaration of 'rp_init()'
  btrfs: Ensure replaced device doesn't have pending chunk allocation
  drm/imx: only send event on crtc disable if kept disabled
  drm/imx: notify drm core before sending event during crtc disable
  lib/mpi: Fix karactx leak in mpi_powm
  ALSA: usb-audio: fix sign unintended sign extension on left shifts
  ALSA: line6: Fix write on zero-sized buffer
  ALSA: firewire-lib/fireworks: fix miss detection of received MIDI messages
  ALSA: seq: fix incorrect order of dest_client/dest_ports arguments
  crypto: user - prevent operating on larval algorithms
  ptrace: Fix ->ptracer_cred handling for PTRACE_TRACEME
  MIPS: Workaround GCC __builtin_unreachable reordering bug
  drm/i915/dmc: protect against reading random memory
  KVM: x86: degrade WARN to pr_warn_ratelimited
  clk: sunxi: fix uninitialized access
  ARC: handle gcc generated __builtin_trap for older compiler
  bug.h: work around GCC PR82365 in BUG()
  ARC: fix allnoconfig build warning
  mfd: omap-usb-tll: Fix register offsets
  MIPS: netlogic: xlr: Remove erroneous check in nlm_fmn_send()
  MIPS: math-emu: do not use bools for arithmetic
  mm/mlock.c: change count_mm_mlocked_page_nr return type
  scripts/decode_stacktrace.sh: prefix addr2line with $CROSS_COMPILE
  scsi: hpsa: correct ioaccel2 chaining
  usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC
  usb: gadget: fusb300_udc: Fix memory leak of fusb300->ep[i]
  ASoC: max98090: remove 24-bit format support if RJ is 0
  drm/mediatek: fix unbind functions
  spi: bitbang: Fix NULL pointer dereference in spi_unregister_master
  ASoC: soc-pcm: BE dai needs prepare when pause release after resume
  ASoC : cs4265 : readable register too low
  Bluetooth: Fix faulty expression for minimum encryption key size check
  tipc: pass tunnel dev as NULL to udp_tunnel(6)_xmit_skb
  bpf: udp: ipv6: Avoid running reuseport's bpf_prog from __udp6_lib_err
  bpf: udp: Avoid calling reuseport's bpf_prog from udp_gro
  net: check before dereferencing netdev_ops during busy poll
  ipv4: Use return value of inet_iif() for __raw_v4_lookup in the while loop
  bonding: Always enable vlan tx offload
  team: Always enable vlan tx offload
  tun: wake up waitqueues after IFF_UP is set
  tipc: check msg->req data len in tipc_nl_compat_bearer_disable
  tipc: change to use register_pernet_device
  sctp: change to hold sk after auth shkey is created successfully
  net: stmmac: fixed new system time seconds value calculation
  af_packet: Block execution of tasks waiting for transmit to complete in AF_PACKET
  cpu/speculation: Warn on unsupported mitigations= parameter
  NFS/flexfiles: Use the correct TCP timeout for flexfiles I/O
  x86/speculation: Allow guests to use SSBD even if host does not
  scsi: vmw_pscsi: Fix use-after-free in pvscsi_queue_lck()
  mm/page_idle.c: fix oops because end_pfn is larger than max_pfn
  fs/binfmt_flat.c: make load_flat_shared_library() work
  fs/proc/array.c: allow reporting eip/esp for all coredumping threads
  net/9p: include trans_common.h to fix missing prototype warning.
  9p: p9dirent_read: check network-provided name length
  9p/rdma: remove useless check in cm_event_handler
  9p: acl: fix uninitialized iattr access
  9p/rdma: do not disconnect on down_interruptible EAGAIN
  perf header: Fix unchecked usage of strncpy()
  perf help: Remove needless use of strncpy()
  perf ui helpline: Use strlcpy() as a shorter form of strncpy() + explicit set nul
  IB/hfi1: Avoid hardlockup with flushlist_lock
  mac80211: Do not use stack memory with scatterlist for GMAC
  mac80211: drop robust management frames from unknown TA
  cfg80211: fix memory leak of wiphy device name
  Bluetooth: Fix regression with minimum encryption key size alignment
  Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
  ARM: imx: cpuidle-imx6sx: Restrict the SW2ISO increase to i.MX6SX
  powerpc/bpf: use unsigned division instruction for 64-bit operations
  can: purge socket error queue on sock destruct
  can: flexcan: fix timeout when set small bitrate
  btrfs: start readahead also in seed devices
  nvme: Fix u32 overflow in the number of namespace list calculation
  hwmon: (pmbus/core) Treat parameters as paged if on multiple pages
  s390/qeth: fix VLAN attribute in bridge_hostnotify udev event
  scsi: ufs: Check that space was properly alloced in copy_query_response
  scripts/checkstack.pl: Fix arm64 wrong or unknown architecture
  drm/arm/hdlcd: Allow a bit of clock tolerance
  net: ethernet: mediatek: Use NET_IP_ALIGN to judge if HW RX_2BYTE_OFFSET is enabled
  net: ethernet: mediatek: Use hw_feature to judge if HWLRO is supported
  sparc: perf: fix updated event period in response to PERF_EVENT_IOC_PERIOD
  net: hns: Fix loopback test failed at copper ports
  net: dsa: mv88e6xxx: avoid error message on remove from VLAN 0
  MIPS: uprobes: remove set but not used variable 'epc'
  IB/{qib, hfi1, rdmavt}: Correct ibv_devinfo max_mr value
  IB/hfi1: Insure freeze_work work_struct is canceled on shutdown
  IB/rdmavt: Fix alloc_qpn() WARN_ON()
  parisc: Fix compiler warnings in float emulation code
  parport: Fix mem leak in parport_register_dev_model
  ARC: fix build warnings with !CONFIG_KPROBES
  apparmor: enforce nullbyte at end of tag string
  Input: uinput - add compat ioctl number translation for UI_*_FF_UPLOAD
  IB/hfi1: Silence txreq allocation warnings
  usb: chipidea: udc: workaround for endpoint conflict issue
  scsi: ufs: Avoid runtime suspend possibly being blocked forever
  gcc-9: silence 'address-of-packed-member' warning
  tracing: Silence GCC 9 array bounds warning
  BACKPORT: kheaders: Do not regenerate archive if config is not changed
  BACKPORT: kheaders: Move from proc to sysfs
  BACKPORT: Provide in-kernel headers to make extending kernel easier

Change-Id: I2fc2e9b2019708f0febb754efbf2a63e47ad5b81
Signed-off-by: jianzhou <jianzhou@codeaurora.org>

parents 2947cce2 70d52cb2

Makefile

+2 −2

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 184
		SUBLEVEL = 185
		EXTRAVERSION =
		NAME = Roaring Lionus

		@@ -694,6 +694,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,)
		KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation)
		KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow)
		KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context)
		KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
		KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias)

		ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION
		@@ -812,7 +813,6 @@ ifeq ($(cc-name),clang)
		KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)
		KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)
		KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
		KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
		KBUILD_CFLAGS += $(call cc-disable-warning, duplicate-decl-specifier)
		# Quiet clang warning: comparison of unsigned expression < 0 is always false
		KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)

arch/arc/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ config ARC
		select GENERIC_SMP_IDLE_THREAD
		select HAVE_ARCH_KGDB
		select HAVE_ARCH_TRACEHOOK
		select HAVE_FUTEX_CMPXCHG
		select HAVE_FUTEX_CMPXCHG if FUTEX
		select HAVE_IOREMAP_PROT
		select HAVE_KPROBES
		select HAVE_KRETPROBES

arch/arc/include/asm/bug.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,8 @@ void die(const char str, struct pt_regs regs, unsigned long address);

		#define BUG() do { \
		pr_warn("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \
		dump_stack(); \
		barrier_before_unreachable(); \
		__builtin_trap(); \
		} while (0)

		#define HAVE_ARCH_BUG

arch/arc/include/asm/cmpxchg.h

+10 −4

Original line number	Diff line number	Diff line
		@@ -92,8 +92,11 @@ __cmpxchg(volatile void *ptr, unsigned long expected, unsigned long new)

		#endif /* CONFIG_ARC_HAS_LLSC */

		#define cmpxchg(ptr, o, n) ((typeof(*(ptr)))__cmpxchg((ptr), \
		(unsigned long)(o), (unsigned long)(n)))
		#define cmpxchg(ptr, o, n) ({ \
		(typeof(*(ptr)))__cmpxchg((ptr), \
		(unsigned long)(o), \
		(unsigned long)(n)); \
		})

		/*
		* atomic_cmpxchg is same as cmpxchg
		@@ -198,8 +201,11 @@ static inline unsigned long __xchg(unsigned long val, volatile void *ptr,
		return __xchg_bad_pointer();
		}

		#define xchg(ptr, with) ((typeof(*(ptr)))__xchg((unsigned long)(with), (ptr), \
		sizeof(*(ptr))))
		#define xchg(ptr, with) ({ \
		(typeof(*(ptr)))__xchg((unsigned long)(with), \
		(ptr), \
		sizeof(*(ptr))); \
		})

		#endif /* CONFIG_ARC_PLAT_EZNPS */

arch/arc/kernel/traps.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -155,3 +155,11 @@ void do_insterror_or_kprobe(unsigned long address, struct pt_regs *regs)

		insterror_is_error(address, regs);
		}

		/*
		* abort() call generated by older gcc for __builtin_trap()
		*/
		void abort(void)
		{
		__asm__ __volatile__("trap_s 5\n");
		}