diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-29 09:44:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-29 09:44:44 -0700 |
| commit | bb1e9b844b989fc9a4dfffbf7a064703cda2a6a6 (patch) | |
| tree | 994d03a5525b8c82fda1fc41382f116cf6e3a40c /include/linux | |
| parent | e717f33e989dbe6446547d7ca97489a980056f3c (diff) | |
| parent | 94e5d714f604d4cb4cb13163f01ede278e69258b (diff) | |
| download | linux-bb1e9b844b989fc9a4dfffbf7a064703cda2a6a6.tar.gz linux-bb1e9b844b989fc9a4dfffbf7a064703cda2a6a6.tar.bz2 linux-bb1e9b844b989fc9a4dfffbf7a064703cda2a6a6.zip | |
Merge branch 'bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
integrity: add ima_counts_put (updated)
integrity: ima audit hash_exists fix
integrity: ima mq_open imbalance msg fix
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ima.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/ima.h b/include/linux/ima.h index b1b827d091a9..0e3f2a4c25f6 100644 --- a/include/linux/ima.h +++ b/include/linux/ima.h @@ -24,6 +24,7 @@ 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_counts_get(struct file *file); +extern void ima_counts_put(struct path *path, int mask); #else static inline int ima_bprm_check(struct linux_binprm *bprm) @@ -60,5 +61,10 @@ static inline void ima_counts_get(struct file *file) { return; } + +static inline void ima_counts_put(struct path *path, int mask) +{ + return; +} #endif /* CONFIG_IMA_H */ #endif /* _LINUX_IMA_H */ |