diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-09-12 22:40:22 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-09-12 22:40:22 +1000 |
| commit | ac60ab4b4968b54fb5af20eac9dd78e36ad910c1 (patch) | |
| tree | a47e414fb34d91eb012b121d8138c6cee1fe065b /include/linux/ima.h | |
| parent | a0cfd75fdc46b56978ece383a7d6f6b04e9087ad (diff) | |
| parent | a2d61ed525f3458a913147fd02b1a5cf15e7551b (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'include/linux/ima.h')
| -rw-r--r-- | include/linux/ima.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ima.h b/include/linux/ima.h index 7cf5e9b32550..120ccc53fcb7 100644 --- a/include/linux/ima.h +++ b/include/linux/ima.h @@ -15,7 +15,7 @@ struct linux_binprm; #ifdef CONFIG_IMA extern int ima_bprm_check(struct linux_binprm *bprm); -extern int ima_file_check(struct file *file, int mask); +extern int ima_file_check(struct file *file, int mask, int opened); extern void ima_file_free(struct file *file); extern int ima_file_mmap(struct file *file, unsigned long prot); extern int ima_module_check(struct file *file); @@ -27,7 +27,7 @@ static inline int ima_bprm_check(struct linux_binprm *bprm) return 0; } -static inline int ima_file_check(struct file *file, int mask) +static inline int ima_file_check(struct file *file, int mask, int opened) { return 0; } |