diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-07-26 10:40:28 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-07-26 10:40:28 +1000 |
| commit | f6fd5c84b9eb93ee6fbf028da87a32aeeecc5ee4 (patch) | |
| tree | 1784d073fac0cb87b9811c43bde0dda3ba16d6ba /include/linux/ima.h | |
| parent | ed3c4f8f862b9e79bafec3b85cde98c95807821e (diff) | |
| parent | 5a9196d715607f76d6b7d96a0970d6065335e62b (diff) | |
Merge tag 'fw-restrict-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next
Diffstat (limited to 'include/linux/ima.h')
| -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 1b7f268cddce..7cf5e9b32550 100644 --- a/include/linux/ima.h +++ b/include/linux/ima.h @@ -19,6 +19,7 @@ extern int ima_file_check(struct file *file, int mask); 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); +extern int ima_fw_from_file(struct file *file, char *buf, size_t size); #else static inline int ima_bprm_check(struct linux_binprm *bprm) @@ -46,6 +47,11 @@ static inline int ima_module_check(struct file *file) return 0; } +static inline int ima_fw_from_file(struct file *file, char *buf, size_t size) +{ + return 0; +} + #endif /* CONFIG_IMA */ #ifdef CONFIG_IMA_APPRAISE |