diff options
Diffstat (limited to 'mm/mmap.c')
| -rw-r--r-- | mm/mmap.c | 7 |
1 files changed, 4 insertions, 3 deletions
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/fs.h> | 20 | #include <linux/fs.h> |
| 21 | #include <linux/personality.h> | 21 | #include <linux/personality.h> |
| 22 | #include <linux/security.h> | 22 | #include <linux/security.h> |
| 23 | #include <linux/ima.h> | ||
| 23 | #include <linux/hugetlb.h> | 24 | #include <linux/hugetlb.h> |
| 24 | #include <linux/profile.h> | 25 | #include <linux/profile.h> |
| 25 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| @@ -1049,6 +1050,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, | |||
| 1049 | error = security_file_mmap(file, reqprot, prot, flags, addr, 0); | 1050 | error = security_file_mmap(file, reqprot, prot, flags, addr, 0); |
| 1050 | if (error) | 1051 | if (error) |
| 1051 | return error; | 1052 | return error; |
| 1053 | error = ima_file_mmap(file, prot); | ||
| 1054 | if (error) | ||
| 1055 | return error; | ||
| 1052 | 1056 | ||
| 1053 | return mmap_region(file, addr, len, flags, vm_flags, pgoff); | 1057 | return mmap_region(file, addr, len, flags, vm_flags, pgoff); |
| 1054 | } | 1058 | } |
| @@ -2477,7 +2481,4 @@ void mm_drop_all_locks(struct mm_struct *mm) | |||
| 2477 | */ | 2481 | */ |
| 2478 | void __init mmap_init(void) | 2482 | void __init mmap_init(void) |
| 2479 | { | 2483 | { |
| 2480 | vm_area_cachep = kmem_cache_create("vm_area_struct", | ||
| 2481 | sizeof(struct vm_area_struct), 0, | ||
| 2482 | SLAB_PANIC, NULL); | ||
| 2483 | } | 2484 | } |
