Commit 4be6354a authored Dec 02, 2019 by jianzhou

Merge android-4.9.194(f360bd46) into msm-4.9



* refs/heads/tmp-f360bd46:
  Linux 4.9.194
  net_sched: let qdisc_put() accept NULL pointer
  ARC: export "abort" for modules
  media: technisat-usb2: break out of loop at end of buffer
  floppy: fix usercopy direction
  iommu/amd: Fix race in increase_address_space()
  keys: Fix missing null pointer check in request_key_auth_describe()
  x86/uaccess: Don't leak the AC flags into __get_user() argument evaluation
  dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe()
  dmaengine: ti: dma-crossbar: Fix a memory leak bug
  net: seeq: Fix the function used to release some memory in an error handling path
  tools/power turbostat: fix buffer overrun
  perf/x86/amd/ibs: Fix sample bias for dispatched micro-ops
  perf/x86/intel: Restrict period on Nehalem
  sky2: Disable MSI on yet another ASUS boards (P6Xxxx)
  ARM: 8901/1: add a criteria for pfn_valid of arm
  cifs: Use kzfree() to zero out the password
  cifs: set domainName when a domain-key is used in multiuser
  NFSv2: Fix write regression
  NFSv2: Fix eof handling
  netfilter: nf_conntrack_ftp: Fix debug output
  x86/apic: Fix arch_dynirq_lower_bound() bug for DT enabled machines
  r8152: Set memory to all 0xFFs on failed reg reads
  batman-adv: Only read OGM2 tvlv_len after buffer len check
  ARM: 8874/1: mm: only adjust sections of valid mm structures
  qed: Add cleanup in qed_slowpath_start()
  Kconfig: Fix the reference to the IDT77105 Phy driver in the description of ATM_NICSTAR_USE_IDT77105
  NFS: Fix initialisation of I/O result struct in nfs_pgio_rpcsetup
  NFSv4: Fix return values for nfs4_file_open()
  s390/bpf: use 32-bit index for tail calls
  ARM: OMAP2+: Fix omap4 errata warning on other SoCs
  s390/bpf: fix lcgr instruction encoding
  ARM: OMAP2+: Fix missing SYSC_HAS_RESET_STATUS for dra7 epwmss
  mwifiex: Fix three heap overflow at parsing element in cfg80211_ap_settings
  tty/serial: atmel: reschedule TX after RX was started
  serial: sprd: correct the wrong sequence of arguments
  KVM: coalesced_mmio: add bounds checking
  xen-netfront: do not assume sk_buff_head list is empty in error handling
  x86/boot: Add missing bootparam that breaks boot on some platforms
  powerpc/mm/radix: Use the right page size for vmemmap mapping
  media: tm6000: double free if usb disconnect while streaming
  USB: usbcore: Fix slab-out-of-bounds bug during device reset
  x86/build: Add -Wnoaddress-of-packed-member to REALMODE_CFLAGS, to silence GCC9 build warning
  nvmem: Use the same permissions for eeprom as for nvmem
  drm/mediatek: mtk_drm_drv.c: Add of_node_put() before goto
  crypto: talitos - HMAC SNOOP NO AFEU mode requires SW icv checking.
  crypto: talitos - Do not modify req->cryptlen on decryption.
  crypto: talitos - fix ECB algs ivsize
  crypto: talitos - check data blocksize in ablkcipher.
  crypto: talitos - fix CTR alg blocksize
  crypto: talitos - check AES key size
  driver core: Fix use-after-free and double free on glue directory
  mtd: rawnand: mtk: Fix wrongly assigned OOB buffer pointer issue
  clk: rockchip: Don't yell about bad mmc phases when getting
  MIPS: VDSO: Use same -m%-float cflag as the kernel proper
  MIPS: VDSO: Prevent use of smp_processor_id()
  KVM: nVMX: handle page fault in vmread
  KVM: x86: work around leak of uninitialized stack contents
  KVM: s390: Do not leak kernel stack data in the KVM_S390_INTERRUPT ioctl
  genirq: Prevent NULL pointer dereference in resend_irqs()
  Btrfs: fix assertion failure during fsync and use of stale transaction
  gpio: fix line flag validation in lineevent_create
  gpio: fix line flag validation in linehandle_create
  Revert "MIPS: SiByte: Enable swiotlb for SWARM, LittleSur and BigSur"
  tun: fix use-after-free when register netdev failed
  tipc: add NULL pointer check before calling kfree_rcu
  tcp: fix tcp_ecn_withdraw_cwr() to clear TCP_ECN_QUEUE_CWR
  sctp: use transport pf_retrans in sctp_do_8_2_transport_strike
  sctp: Fix the link time qualifier of 'sctp_ctrlsock_exit()'
  sch_hhf: ensure quantum and hhf_non_hh_weight are non-zero
  net: gso: Fix skb_segment splat when splitting gso_size mangled skb having linear-headed frag_list
  net: Fix null de-reference of device refcount
  isdn/capi: check message length in capi_write()
  ipv6: Fix the link time qualifier of 'ping_v6_proc_exit_net()'
  cdc_ether: fix rndis support for Mediatek based smartphones
  bridge/mdb: remove wrong use of NLM_F_MULTI
  ANDROID: regression introduced override_creds=off
  UPSTREAM: psi: get poll_work to run when calling poll syscall next time
  UPSTREAM: sched/psi: Do not require setsched permission from the trigger creator
  UPSTREAM: sched/psi: Reduce psimon FIFO priority
  ANDROID: Revert "ANDROID: sched: Disallow WALT with CFS bandwidth control"
  ANDROID: sched: WALT: Add support for CFS_BANDWIDTH
  ANDROID: sched: WALT: Refactor cumulative runnable average fixup
  BACKPORT: arch: add pidfd and io_uring syscalls everywhere
  UPSTREAM: pidfd: fix a poll race when setting exit_state
  BACKPORT: arch: wire-up pidfd_open()
  BACKPORT: pid: add pidfd_open()
  UPSTREAM: pidfd: add polling support
  UPSTREAM: signal: improve comments
  BACKPORT: fork: do not release lock that wasn't taken
  BACKPORT: signal: support CLONE_PIDFD with pidfd_send_signal
  BACKPORT: clone: add CLONE_PIDFD
  UPSTREAM: Make anon_inodes unconditional
  UPSTREAM: signal: use fdget() since we don't allow O_PATH
  UPSTREAM: signal: don't silently convert SI_USER signals to non-current pidfd
  BACKPORT: signal: add pidfd_send_signal() syscall
  ANDROID: sched: Disallow WALT with CFS bandwidth control
  ANDROID: fiq_debugger: remove
  ANDROID: fix kernelci build-break in lowmemorykiller
  ANDROID: Fixes to locking around handle_lmk_event
  UPSTREAM: net/ipv6: allow sysctl to change link-local address generation mode
  ANDROID: fix binder change in merge of 4.9.188
  fs/crypto: Fix 4.9.186 missmerge
  UPSTREAM: net-ipv6-ndisc: add support for RFC7710 RA Captive Portal Identifier
  ANDROID: fix up 9p filesystem due to CFI non-upstream patches
  ANDROID: enable CONFIG_RTC_DRV_TEST on cuttlefish
  ANDROID: xfrm: remove in_compat_syscall() checks
  UPSTREAM: binder: Set end of SG buffer area properly.
  ANDROID: Avoid taking multiple locks in handle_lmk_event
  efi/libstub: remove duplicate nokaslr
  UPSTREAM: binder: check for overflow when alloc for security context
  BACKPORT: binder: fix race between munmap() and direct reclaim
  Revert "fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied"
  Revert "fib_rules: fix error in backport of e9919a24d302 ("fib_rules: return 0...")"
  Revert "x86/build: Move _etext to actual end of .text"
  UPSTREAM: fib_rules: fix error in backport of e9919a24d302 ("fib_rules: return 0...")
  ANDROID: cuttlefish 4.9: enable CONFIG_CRYPTO_AES_NI_INTEL=y
  UPSTREAM: bpf: relax inode permission check for retrieving bpf program
  ANDROID: cuttlefish_defconfig: Disable DEVTMPFS
  ANDROID: block/cfq-iosched: make group_idle per io cgroup tunable
  ANDROID: Move from clang r349610 to r353983c.
  ANDROID: cuttlefish_defconfig: Enable CONFIG_CPUSETS and CONFIG_CGROUP_SCHEDTUNE
  ANDROID: Communicates LMK events to userland where they can be logged
  ANDROID: cuttlefish_defconfig: Enable CONFIG_XFRM_STATISTICS
  ANDROID: cuttlefish_defconfig: Enable L2TP/PPTP
  Make arm64 serial port config compatible with crosvm
  ANDROID: Makefile: Properly resolve 4.9.169 merge
  ANDROID: cuttlefish_defconfig: Enable CONFIG_OVERLAY_FS
  ANDROID: cuttlefish: enable CONFIG_NET_SCH_INGRESS=y
  UPSTREAM: virt_wifi: Remove REGULATORY_WIPHY_SELF_MANAGED

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

parents f8cb0592 f360bd46

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 193
		SUBLEVEL = 194
		EXTRAVERSION =
		NAME = Roaring Lionus

arch/arc/kernel/traps.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -163,3 +163,4 @@ void abort(void)
		{
		__asm__ __volatile__("trap_s 5\n");
		}
		EXPORT_SYMBOL(abort);

arch/arm/mach-omap2/omap4-common.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -131,6 +131,9 @@ static int __init omap4_sram_init(void)
		struct device_node *np;
		struct gen_pool *sram_pool;

		if (!soc_is_omap44xx() && !soc_is_omap54xx())
		return 0;

		np = of_find_compatible_node(NULL, NULL, "ti,omap4-mpu");
		if (!np)
		pr_warn("%s:Unable to allocate sram needed to handle errata I688\n",

arch/arm/mach-omap2/omap_hwmod_7xx_data.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -387,7 +387,8 @@ static struct omap_hwmod dra7xx_dcan2_hwmod = {
		static struct omap_hwmod_class_sysconfig dra7xx_epwmss_sysc = {
		.rev_offs = 0x0,
		.sysc_offs = 0x4,
		.sysc_flags = SYSC_HAS_SIDLEMODE \| SYSC_HAS_SOFTRESET,
		.sysc_flags = SYSC_HAS_SIDLEMODE \| SYSC_HAS_SOFTRESET \|
		SYSC_HAS_RESET_STATUS,
		.idlemodes = (SIDLE_FORCE \| SIDLE_NO \| SIDLE_SMART),
		.sysc_fields = &omap_hwmod_sysc_type2,
		};

arch/arm/mm/init.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -805,6 +805,7 @@ static void update_sections_early(struct section_perm perms[], int n)
		if (t->flags & PF_KTHREAD)
		continue;
		for_each_thread(t, s)
		if (s->mm)
		set_section_perms(perms, n, true, s->mm);
		}
		read_unlock(&tasklist_lock);