1 files changed, 20 insertions, 4 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index 677d184b0d42..fac66337da2a 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -230,8 +230,11 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
         might_sleep();
         if (vma->vm_ops && vma->vm_ops->close)
                 vma->vm_ops->close(vma);
-        if (vma->vm_file)
+        if (vma->vm_file) {
                 fput(vma->vm_file);
+                if (vma->vm_flags & VM_EXECUTABLE)
+                        removed_exe_file_vma(vma->vm_mm);
+        }
         mpol_put(vma_policy(vma));
         kmem_cache_free(vm_area_cachep, vma);
         return next;
@@ -623,8 +626,11 @@ again:			remove_next = 1 + (end > next->vm_end);
                 spin_unlock(&mapping->i_mmap_lock);
 
         if (remove_next) {
-                if (file)
+                if (file) {
                         fput(file);
+                        if (next->vm_flags & VM_EXECUTABLE)
+                                removed_exe_file_vma(mm);
+                }
                 mm->map_count--;
                 mpol_put(vma_policy(next));
                 kmem_cache_free(vm_area_cachep, next);
@@ -1154,6 +1160,8 @@ munmap_back:
                 error = file->f_op->mmap(file, vma);
                 if (error)
                         goto unmap_and_free_vma;
+                if (vm_flags & VM_EXECUTABLE)
+                        added_exe_file_vma(mm);
         } else if (vm_flags & VM_SHARED) {
                 error = shmem_zero_setup(vma);
                 if (error)
@@ -1185,6 +1193,8 @@ munmap_back:
                 mpol_put(vma_policy(vma));
                 kmem_cache_free(vm_area_cachep, vma);
                 fput(file);
+                if (vm_flags & VM_EXECUTABLE)
+                        removed_exe_file_vma(mm);
         } else {
                 vma_link(mm, vma, prev, rb_link, rb_parent);
                 file = vma->vm_file;
@@ -1817,8 +1827,11 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
         }
         vma_set_policy(new, pol);
 
-        if (new->vm_file)
+        if (new->vm_file) {
                 get_file(new->vm_file);
+                if (vma->vm_flags & VM_EXECUTABLE)
+                        added_exe_file_vma(mm);
+        }
 
         if (new->vm_ops && new->vm_ops->open)
                 new->vm_ops->open(new);
@@ -2135,8 +2148,11 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
                         new_vma->vm_start = addr;
                         new_vma->vm_end = addr + len;
                         new_vma->vm_pgoff = pgoff;
-                        if (new_vma->vm_file)
+                        if (new_vma->vm_file) {
                                 get_file(new_vma->vm_file);
+                                if (vma->vm_flags & VM_EXECUTABLE)
+                                        added_exe_file_vma(mm);
+                        }
                         if (new_vma->vm_ops && new_vma->vm_ops->open)
                                 new_vma->vm_ops->open(new_vma);
                         vma_link(mm, new_vma, prev, rb_link, rb_parent);