diff options
| author | James Morris <jmorris@namei.org> | 2009-06-11 11:03:14 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-11 11:03:14 +1000 |
| commit | 73fbad283cfbbcf02939bdbda31fc4a30e729cca (patch) | |
| tree | 7c89fe13e1b4a2c7f2d60f4ea6eaf69c14bccab7 /include/linux/ima.h | |
| parent | 769f3e8c384795cc350e2aae27de2a12374d19d4 (diff) | |
| parent | 35f2c2f6f6ae13ef23c4f68e6d3073753077ca43 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/ima.h')
| -rw-r--r-- | include/linux/ima.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/linux/ima.h b/include/linux/ima.h index 0e2aa45cb0ce..b1b827d091a9 100644 --- a/include/linux/ima.h +++ b/include/linux/ima.h @@ -13,14 +13,17 @@ #include <linux/fs.h> struct linux_binprm; +#define IMA_COUNT_UPDATE 1 +#define IMA_COUNT_LEAVE 0 + #ifdef CONFIG_IMA extern int ima_bprm_check(struct linux_binprm *bprm); extern int ima_inode_alloc(struct inode *inode); extern void ima_inode_free(struct inode *inode); -extern int ima_path_check(struct path *path, int mask); +extern int ima_path_check(struct path *path, int mask, int update_counts); extern void ima_file_free(struct file *file); extern int ima_file_mmap(struct file *file, unsigned long prot); -extern void ima_shm_check(struct file *file); +extern void ima_counts_get(struct file *file); #else static inline int ima_bprm_check(struct linux_binprm *bprm) @@ -38,7 +41,7 @@ static inline void ima_inode_free(struct inode *inode) return; } -static inline int ima_path_check(struct path *path, int mask) +static inline int ima_path_check(struct path *path, int mask, int update_counts) { return 0; } @@ -53,7 +56,7 @@ static inline int ima_file_mmap(struct file *file, unsigned long prot) return 0; } -static inline void ima_shm_check(struct file *file) +static inline void ima_counts_get(struct file *file) { return; } |