Merge 4.4.234 into android-4.4-p

Changes in 4.4.234
	drm/imx: imx-ldb: Disable both channels for split mode in enc->disable()
	perf probe: Fix memory leakage when the probe point is not found
	net/compat: Add missing sock updates for SCM_RIGHTS
	watchdog: f71808e_wdt: indicate WDIOF_CARDRESET support in watchdog_info.options
	watchdog: f71808e_wdt: remove use of wrong watchdog_info option
	coredump: fix race condition between collapse_huge_page() and core dumping
	khugepaged: khugepaged_test_exit() check mmget_still_valid()
	khugepaged: adjust VM_BUG_ON_MM() in __khugepaged_enter()
	btrfs: export helpers for subvolume name/id resolution
	btrfs: don't show full path of bind mounts in subvol=
	romfs: fix uninitialized memory leak in romfs_dev_read()
	mm: include CMA pages in lowmem_reserve at boot
	mm, page_alloc: fix core hung in free_pcppages_bulk()
	ext4: clean up ext4_match() and callers
	ext4: fix checking of directory entry validity for inline directories
	media: budget-core: Improve exception handling in budget_register()
	media: vpss: clean up resources in init
	Input: psmouse - add a newline when printing 'proto' by sysfs
	m68knommu: fix overwriting of bits in ColdFire V3 cache control
	xfs: fix inode quota reservation checks
	jffs2: fix UAF problem
	scsi: libfc: Free skb in fc_disc_gpn_id_resp() for valid cases
	virtio_ring: Avoid loop when vq is broken in virtqueue_poll
	xfs: Fix UBSAN null-ptr-deref in xfs_sysfs_init
	alpha: fix annotation of io{read,write}{16,32}be()
	ext4: fix potential negative array index in do_split()
	ASoC: intel: Fix memleak in sst_media_open
	powerpc: Allow 4224 bytes of stack expansion for the signal frame
	epoll: Keep a reference on files added to the check list
	do_epoll_ctl(): clean the failure exits up a bit
	mm/hugetlb: fix calculation of adjust_range_if_pmd_sharing_possible
	xen: don't reschedule in preemption off sections
	omapfb: dss: Fix max fclk divider for omap36xx
	KVM: arm/arm64: Don't reschedule in unmap_stage2_range()
	Linux 4.4.234

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I974097d685afb4d7ecb61a11d8e270d70809f548

2 files changed, 8 insertions, 0 deletions

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 6a2cd2e79a11..ebe9c620a4d1 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1139,6 +1139,10 @@ void unmap_vmas(struct mmu_gather *tlb, struct vm_area_struct *start_vma,
  * followed by taking the mmap_sem for writing before modifying the
  * vmas or anything the coredump pretends not to change from under it.
  *
+ * It also has to be called when mmgrab() is used in the context of
+ * the process, but then the mm_count refcount is transferred outside
+ * the context of the process to run down_write() on that pinned mm.
+ *
  * NOTE: find_extend_vma() called from GUP context is the only place
  * that can modify the "mm" (notably the vm_start/end) under mmap_sem
  * for reading and outside the context of the process, so it is also
diff --git a/include/net/sock.h b/include/net/sock.h
index dc669a3601cb..a1e0077f7950 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -780,6 +780,8 @@ static inline int sk_memalloc_socks(void)
 {
 	return static_key_false(&memalloc_socks);
 }
+
+void __receive_sock(struct file *file);
 #else
 
 static inline int sk_memalloc_socks(void)
@@ -787,6 +789,8 @@ static inline int sk_memalloc_socks(void)
 	return 0;
 }
 
+static inline void __receive_sock(struct file *file)
+{ }
 #endif
 
 static inline gfp_t sk_gfp_atomic(const struct sock *sk, gfp_t gfp_mask)