Merge branch 'master' into next

[linux-flexiantxendom0-natty.git] / mm / mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index 214b6a2..3b3ed0b 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -20,6 +20,7 @@
 #include <linux/fs.h>
 #include <linux/personality.h>
 #include <linux/security.h>
+#include <linux/ima.h>
 #include <linux/hugetlb.h>
 #include <linux/profile.h>
 #include <linux/module.h>
@@ -1052,6 +1053,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
        error = security_file_mmap(file, reqprot, prot, flags, addr, 0);
        if (error)
                return error;
+       error = ima_file_mmap(file, prot);
+       if (error)
+               return error;
 
        return mmap_region(file, addr, len, flags, vm_flags, pgoff,
                           accountable);