From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Fri, 9 Oct 2020 19:57:40 +0000 (-0400)
Subject: mm/mmap: Change vm_brk_flags() to use mm_populate_vma()
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4429e385768daaa14ec572643f531d78a40a439c;p=users%2Fjedix%2Flinux-maple.git

mm/mmap: Change vm_brk_flags() to use mm_populate_vma()

Skip searching for the vma to populate after creating it by passing in a pointer.

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---

diff --git a/mm/mmap.c b/mm/mmap.c
index 4f5e0a0ad551..c0ec7ea4ffd2 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -3035,6 +3035,7 @@ out:
 int vm_brk_flags(unsigned long addr, unsigned long request, unsigned long flags)
 {
 	struct mm_struct *mm = current->mm;
+	struct vm_area_struct *vma = NULL;
 	unsigned long len;
 	int ret;
 	bool populate;
@@ -3048,11 +3049,11 @@ int vm_brk_flags(unsigned long addr, unsigned long request, unsigned long flags)
 	if (mmap_write_lock_killable(mm))
 		return -EINTR;
 
-	ret = do_brk_flags(NULL, addr, len, flags);
+	ret = do_brk_flags(&vma, addr, len, flags);
 	populate = ((mm->def_flags & VM_LOCKED) != 0);
 	mmap_write_unlock(mm);
 	if (populate && !ret)
-		mm_populate(addr, len);
+		mm_populate_vma(vma, addr, addr + len);
 	return ret;
 }
 EXPORT_SYMBOL(vm_brk_flags);