Merge ../scsi-rc-fixes-2.6

1 files changed, 14 insertions, 12 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index eea8eefd51a8..7b40abd7cba2 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -900,17 +900,6 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
         int accountable = 1;
         unsigned long charged = 0, reqprot = prot;
 
-        if (file) {
-                if (is_file_hugepages(file))
-                        accountable = 0;
-
-                if (!file->f_op || !file->f_op->mmap)
-                        return -ENODEV;
-
-                if ((prot & PROT_EXEC) &&
-                    (file->f_vfsmnt->mnt_flags & MNT_NOEXEC))
-                        return -EPERM;
-        }
         /*
          * Does the application expect PROT_READ to imply PROT_EXEC?
          *
@@ -1000,6 +989,16 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
                 case MAP_PRIVATE:
                         if (!(file->f_mode & FMODE_READ))
                                 return -EACCES;
+                        if (file->f_vfsmnt->mnt_flags & MNT_NOEXEC) {
+                                if (vm_flags & VM_EXEC)
+                                        return -EPERM;
+                                vm_flags &= ~VM_MAYEXEC;
+                        }
+                        if (is_file_hugepages(file))
+                                accountable = 0;
+
+                        if (!file->f_op || !file->f_op->mmap)
+                                return -ENODEV;
                         break;
 
                 default:
@@ -1380,7 +1379,7 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
                  * Check if the given range is hugepage aligned, and
                  * can be made suitable for hugepages.
                  */
-                ret = prepare_hugepage_range(addr, len);
+                ret = prepare_hugepage_range(addr, len, pgoff);
         } else {
                 /*
                  * Ensure that a normal request is not falling in a
@@ -1881,6 +1880,9 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
         if ((addr + len) > TASK_SIZE || (addr + len) < addr)
                 return -EINVAL;
 
+        if (is_hugepage_only_range(mm, addr, len))
+                return -EINVAL;
+
         flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
 
         error = arch_mmap_check(addr, len, flags);