2 files changed, 12 insertions, 19 deletions

diff --git a/mm/gup.c b/mm/gup.c
index b70d7ba7cc13..fc5f98069f4e 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1238,8 +1238,6 @@ int __mm_populate(unsigned long start, unsigned long len, int ignore_errors)
         int locked = 0;
         long ret = 0;
 
-        VM_BUG_ON(start & ~PAGE_MASK);
-        VM_BUG_ON(len != PAGE_ALIGN(len));
         end = start + len;
 
         for (nstart = start; nstart < end; nstart = nend) {
diff --git a/mm/mmap.c b/mm/mmap.c
index d1eb87ef4b1a..5801b5f0a634 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -186,8 +186,8 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
         return next;
 }
 
-static int do_brk(unsigned long addr, unsigned long len, struct list_head *uf);
-
+static int do_brk_flags(unsigned long addr, unsigned long request, unsigned long flags,
+                struct list_head *uf);
 SYSCALL_DEFINE1(brk, unsigned long, brk)
 {
         unsigned long retval;
@@ -245,7 +245,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
                 goto out;
 
         /* Ok, looks good - let it rip. */
-        if (do_brk(oldbrk, newbrk-oldbrk, &uf) < 0)
+        if (do_brk_flags(oldbrk, newbrk-oldbrk, 0, &uf) < 0)
                 goto out;
 
 set_brk:
@@ -2929,21 +2929,14 @@ static inline void verify_mm_writelocked(struct mm_struct *mm)
  *  anonymous maps.  eventually we may be able to do some
  *  brk-specific accounting here.
  */
-static int do_brk_flags(unsigned long addr, unsigned long request, unsigned long flags, struct list_head *uf)
+static int do_brk_flags(unsigned long addr, unsigned long len, unsigned long flags, struct list_head *uf)
 {
         struct mm_struct *mm = current->mm;
         struct vm_area_struct *vma, *prev;
-        unsigned long len;
         struct rb_node **rb_link, *rb_parent;
         pgoff_t pgoff = addr >> PAGE_SHIFT;
         int error;
 
-        len = PAGE_ALIGN(request);
-        if (len < request)
-                return -ENOMEM;
-        if (!len)
-                return 0;
-
         /* Until we need other flags, refuse anything except VM_EXEC. */
         if ((flags & (~VM_EXEC)) != 0)
                 return -EINVAL;
@@ -3015,18 +3008,20 @@ out:
         return 0;
 }
 
-static int do_brk(unsigned long addr, unsigned long len, struct list_head *uf)
-{
-        return do_brk_flags(addr, len, 0, uf);
-}
-
-int vm_brk_flags(unsigned long addr, unsigned long len, unsigned long flags)
+int vm_brk_flags(unsigned long addr, unsigned long request, unsigned long flags)
 {
         struct mm_struct *mm = current->mm;
+        unsigned long len;
         int ret;
         bool populate;
         LIST_HEAD(uf);
 
+        len = PAGE_ALIGN(request);
+        if (len < request)
+                return -ENOMEM;
+        if (!len)
+                return 0;
+
         if (down_write_killable(&mm->mmap_sem))
                 return -EINTR;