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 /security/integrity/ima/ima.h | |
| parent | ed3c4f8f862b9e79bafec3b85cde98c95807821e (diff) | |
| parent | 5a9196d715607f76d6b7d96a0970d6065335e62b (diff) | |
| download | op-kernel-dev-f6fd5c84b9eb93ee6fbf028da87a32aeeecc5ee4.zip op-kernel-dev-f6fd5c84b9eb93ee6fbf028da87a32aeeecc5ee4.tar.gz | |
Merge tag 'fw-restrict-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next
Diffstat (limited to 'security/integrity/ima/ima.h')
| -rw-r--r-- | security/integrity/ima/ima.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index c42056e..57da4bd 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h @@ -158,7 +158,7 @@ struct integrity_iint_cache *integrity_iint_insert(struct inode *inode); struct integrity_iint_cache *integrity_iint_find(struct inode *inode); /* IMA policy related functions */ -enum ima_hooks { FILE_CHECK = 1, MMAP_CHECK, BPRM_CHECK, MODULE_CHECK, POST_SETATTR }; +enum ima_hooks { FILE_CHECK = 1, MMAP_CHECK, BPRM_CHECK, MODULE_CHECK, FIRMWARE_CHECK, POST_SETATTR }; int ima_match_policy(struct inode *inode, enum ima_hooks func, int mask, int flags); @@ -171,6 +171,7 @@ void ima_delete_rules(void); #define IMA_APPRAISE_ENFORCE 0x01 #define IMA_APPRAISE_FIX 0x02 #define IMA_APPRAISE_MODULES 0x04 +#define IMA_APPRAISE_FIRMWARE 0x08 #ifdef CONFIG_IMA_APPRAISE int ima_appraise_measurement(int func, struct integrity_iint_cache *iint, |
