2 files changed, 3 insertions, 8 deletions

diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 55af8c5b57e6..3a6e8731646c 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -485,7 +485,7 @@ static int sel_mmap_policy(struct file *filp, struct vm_area_struct *vma)
                         return -EACCES;
         }
 
-        vma->vm_flags |= VM_RESERVED;
+        vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
         vma->vm_ops = &sel_mmap_policy_ops;
 
         return 0;
diff --git a/security/tomoyo/util.c b/security/tomoyo/util.c
index 867558c98334..2952ba576fb9 100644
--- a/security/tomoyo/util.c
+++ b/security/tomoyo/util.c
@@ -949,18 +949,13 @@ bool tomoyo_path_matches_pattern(const struct tomoyo_path_info *filename,
 const char *tomoyo_get_exe(void)
 {
         struct mm_struct *mm = current->mm;
-        struct vm_area_struct *vma;
         const char *cp = NULL;
 
         if (!mm)
                 return NULL;
         down_read(&mm->mmap_sem);
-        for (vma = mm->mmap; vma; vma = vma->vm_next) {
-                if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file) {
-                        cp = tomoyo_realpath_from_path(&vma->vm_file->f_path);
-                        break;
-                }
-        }
+        if (mm->exe_file)
+                cp = tomoyo_realpath_from_path(&mm->exe_file->f_path);
         up_read(&mm->mmap_sem);
         return cp;
 }