1 files changed, 11 insertions, 12 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index 9d548512ff8a..834b2d785f1e 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -179,14 +179,12 @@ int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin)
                 goto error;
         }
 
-        allowed = (totalram_pages - hugetlb_total_pages())
-                * sysctl_overcommit_ratio / 100;
+        allowed = vm_commit_limit();
         /*
          * Reserve some for root
          */
         if (!cap_sys_admin)
                 allowed -= sysctl_admin_reserve_kbytes >> (PAGE_SHIFT - 10);
-        allowed += total_swap_pages;
 
         /*
          * Don't let a single process grow so big a user can't recover
@@ -1299,7 +1297,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
                                 vm_flags &= ~VM_MAYEXEC;
                         }
 
-                        if (!file->f_op || !file->f_op->mmap)
+                        if (!file->f_op->mmap)
                                 return -ENODEV;
                         if (vm_flags & (VM_GROWSDOWN|VM_GROWSUP))
                                 return -EINVAL;
@@ -1856,7 +1854,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
         struct vm_area_struct *vma;
         struct vm_unmapped_area_info info;
 
-        if (len > TASK_SIZE)
+        if (len > TASK_SIZE - mmap_min_addr)
                 return -ENOMEM;
 
         if (flags & MAP_FIXED)
@@ -1865,14 +1863,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
         if (addr) {
                 addr = PAGE_ALIGN(addr);
                 vma = find_vma(mm, addr);
-                if (TASK_SIZE - len >= addr &&
+                if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
                     (!vma || addr + len <= vma->vm_start))
                         return addr;
         }
 
         info.flags = 0;
         info.length = len;
-        info.low_limit = TASK_UNMAPPED_BASE;
+        info.low_limit = mm->mmap_base;
         info.high_limit = TASK_SIZE;
         info.align_mask = 0;
         return vm_unmapped_area(&info);
@@ -1895,7 +1893,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
         struct vm_unmapped_area_info info;
 
         /* requested length too big for entire address space */
-        if (len > TASK_SIZE)
+        if (len > TASK_SIZE - mmap_min_addr)
                 return -ENOMEM;
 
         if (flags & MAP_FIXED)
@@ -1905,14 +1903,14 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
         if (addr) {
                 addr = PAGE_ALIGN(addr);
                 vma = find_vma(mm, addr);
-                if (TASK_SIZE - len >= addr &&
+                if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
                                 (!vma || addr + len <= vma->vm_start))
                         return addr;
         }
 
         info.flags = VM_UNMAPPED_AREA_TOPDOWN;
         info.length = len;
-        info.low_limit = PAGE_SIZE;
+        info.low_limit = max(PAGE_SIZE, mmap_min_addr);
         info.high_limit = mm->mmap_base;
         info.align_mask = 0;
         addr = vm_unmapped_area(&info);
@@ -1951,7 +1949,7 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
                 return -ENOMEM;
 
         get_area = current->mm->get_unmapped_area;
-        if (file && file->f_op && file->f_op->get_unmapped_area)
+        if (file && file->f_op->get_unmapped_area)
                 get_area = file->f_op->get_unmapped_area;
         addr = get_area(file, addr, len, pgoff, flags);
         if (IS_ERR_VALUE(addr))
@@ -2726,7 +2724,8 @@ void exit_mmap(struct mm_struct *mm)
         }
         vm_unacct_memory(nr_accounted);
 
-        WARN_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
+        WARN_ON(atomic_long_read(&mm->nr_ptes) >
+                        (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
 }
 
 /* Insert vm structure into process list sorted by address