From: Stricted <info@stricted.net>
Date: Wed, 21 Mar 2018 21:47:17 +0000 (+0100)
Subject: Merge tag 'v3.10.86' into update
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=45f8c76c719654a77b4fdfc5dfbdf8a3cf3bb664;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge tag 'v3.10.86' into update

This is the 3.10.86 stable release
---

45f8c76c719654a77b4fdfc5dfbdf8a3cf3bb664
diff --cc mm/memory.c
index 9feed4bfb323,30bf9cce8c2b..313d94a9ae26
--- a/mm/memory.c
+++ b/mm/memory.c
@@@ -3533,11 -3498,10 +3533,14 @@@ static int do_linear_fault(struct mm_st
  	pgoff_t pgoff = (((address & PAGE_MASK)
  			- vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
  
 +	/* The VMA was not fully populated on mmap() or missing VM_DONTEXPAND */
 +	if (!vma->vm_ops->fault)
 +		return VM_FAULT_SIGBUS;
 +
  	pte_unmap(page_table);
+ 	/* The VMA was not fully populated on mmap() or missing VM_DONTEXPAND */
+ 	if (!vma->vm_ops->fault)
+ 		return VM_FAULT_SIGBUS;
  	return __do_fault(mm, vma, address, pmd, pgoff, flags, orig_pte);
  }