diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2009-10-22 17:30:13 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-10-25 12:22:48 +0800 |
| commit | 6c21a7fb492bf7e2c4985937082ce58ddeca84bd (patch) | |
| tree | 6cfe11ba4b8eee26ee8b02d2b4a5fcc6ea07e4bd /mm/mmap.c | |
| parent | 6e8e16c7bc298d7887584c3d027e05db3e86eed9 (diff) | |
| download | linux-6c21a7fb492bf7e2c4985937082ce58ddeca84bd.tar.bz2 | |
LSM: imbed ima calls in the security hooks
Based on discussions on LKML and LSM, where there are consecutive
security_ and ima_ calls in the vfs layer, move the ima_ calls to
the existing security_ hooks.
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'mm/mmap.c')
| -rw-r--r-- | mm/mmap.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mm/mmap.c b/mm/mmap.c index 73f5e4b64010..292ddc3cef9c 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -20,7 +20,6 @@ #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> @@ -1061,9 +1060,6 @@ 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); } |