X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=mm%2Fmmap.c;h=1abb9185a686d2787125c7af61120b68e726ccb5;hb=0a0dd05dd7e1a800241888cbf515bf8d3dc2e59c;hp=00ced3ee49a8cd393d199656fc816980d4e7b1e6;hpb=9480c53e9b2aa13a06283ffb96bb8f1873ac4e9a;p=safe%2Fjmp%2Flinux-2.6

diff --git a/mm/mmap.c b/mm/mmap.c
index 00ced3e..1abb918 100644
--- 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>
@@ -1049,6 +1050,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);
 }