Merge 4.14.105 into android-4.14-p

[GitHub/LineageOS/android_kernel_motorola_exynos9610.git] / mm / mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index ddbdf4928ab75f22c88cb3bab6599cdd9ed040ed..a05f201917e255f2b3fe9c31a8d9a243b24340ac 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2357,12 +2357,11 @@ int expand_downwards(struct vm_area_struct *vma,
 {
        struct mm_struct *mm = vma->vm_mm;
        struct vm_area_struct *prev;
-       int error;
+       int error = 0;
 
        address &= PAGE_MASK;
-       error = security_mmap_addr(address);
-       if (error)
-               return error;
+       if (address < mmap_min_addr)
+               return -EPERM;
 
        /* Enforce stack_guard_gap */
        prev = vma->vm_prev;