Merge branch 'mm-rst' into docs-next

[linux-block.git] / mm / mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index 39fc51d1639c7ff2e7f6e2775a42773c9ce33891..919cdefacf1533a0f0b62a126a578d22eb0af087 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1342,6 +1342,10 @@ unsigned long do_mmap(struct file *file, unsigned long addr,
                if (!(file && path_noexec(&file->f_path)))
                        prot |= PROT_EXEC;
 
+       /* force arch specific MAP_FIXED handling in get_unmapped_area */
+       if (flags & MAP_FIXED_NOREPLACE)
+               flags |= MAP_FIXED;
+
        if (!(flags & MAP_FIXED))
                addr = round_hint_to_min(addr);
 
@@ -1365,6 +1369,13 @@ unsigned long do_mmap(struct file *file, unsigned long addr,
        if (offset_in_page(addr))
                return addr;
 
+       if (flags & MAP_FIXED_NOREPLACE) {
+               struct vm_area_struct *vma = find_vma(mm, addr);
+
+               if (vma && vma->vm_start <= addr)
+                       return -EEXIST;
+       }
+
        if (prot == PROT_EXEC) {
                pkey = execute_only_pkey(mm);
                if (pkey < 0)
@@ -1488,9 +1499,9 @@ unsigned long do_mmap(struct file *file, unsigned long addr,
        return addr;
 }
 
-SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len,
-               unsigned long, prot, unsigned long, flags,
-               unsigned long, fd, unsigned long, pgoff)
+unsigned long ksys_mmap_pgoff(unsigned long addr, unsigned long len,
+                             unsigned long prot, unsigned long flags,
+                             unsigned long fd, unsigned long pgoff)
 {
        struct file *file = NULL;
        unsigned long retval;
@@ -1537,6 +1548,13 @@ out_fput:
        return retval;
 }
 
+SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len,
+               unsigned long, prot, unsigned long, flags,
+               unsigned long, fd, unsigned long, pgoff)
+{
+       return ksys_mmap_pgoff(addr, len, prot, flags, fd, pgoff);
+}
+
 #ifdef __ARCH_WANT_SYS_OLD_MMAP
 struct mmap_arg_struct {
        unsigned long addr;
@@ -1556,8 +1574,8 @@ SYSCALL_DEFINE1(old_mmap, struct mmap_arg_struct __user *, arg)
        if (offset_in_page(a.offset))
                return -EINVAL;
 
-       return sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd,
-                             a.offset >> PAGE_SHIFT);
+       return ksys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd,
+                              a.offset >> PAGE_SHIFT);
 }
 #endif /* __ARCH_WANT_SYS_OLD_MMAP */
 
@@ -3184,13 +3202,15 @@ bool may_expand_vm(struct mm_struct *mm, vm_flags_t flags, unsigned long npages)
                if (rlimit(RLIMIT_DATA) == 0 &&
                    mm->data_vm + npages <= rlimit_max(RLIMIT_DATA) >> PAGE_SHIFT)
                        return true;
-               if (!ignore_rlimit_data) {
-                       pr_warn_once("%s (%d): VmData %lu exceed data ulimit %lu. Update limits or use boot option ignore_rlimit_data.\n",
-                                    current->comm, current->pid,
-                                    (mm->data_vm + npages) << PAGE_SHIFT,
-                                    rlimit(RLIMIT_DATA));
+
+               pr_warn_once("%s (%d): VmData %lu exceed data ulimit %lu. Update limits%s.\n",
+                            current->comm, current->pid,
+                            (mm->data_vm + npages) << PAGE_SHIFT,
+                            rlimit(RLIMIT_DATA),
+                            ignore_rlimit_data ? "" : " or use boot option ignore_rlimit_data");
+
+               if (!ignore_rlimit_data)
                        return false;
-               }
        }
 
        return true;