diff options
Diffstat (limited to 'security/integrity/ima')
-rw-r--r-- | security/integrity/ima/ima.h | 6 | ||||
-rw-r--r-- | security/integrity/ima/ima_appraise.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index 8180adde10b7..6ee8826662cc 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h | |||
@@ -143,7 +143,7 @@ void ima_delete_rules(void); | |||
143 | #ifdef CONFIG_IMA_APPRAISE | 143 | #ifdef CONFIG_IMA_APPRAISE |
144 | int ima_appraise_measurement(struct integrity_iint_cache *iint, | 144 | int ima_appraise_measurement(struct integrity_iint_cache *iint, |
145 | struct file *file, const unsigned char *filename); | 145 | struct file *file, const unsigned char *filename); |
146 | int ima_must_appraise(struct inode *inode, enum ima_hooks func, int mask); | 146 | int ima_must_appraise(struct inode *inode, int mask, enum ima_hooks func); |
147 | void ima_update_xattr(struct integrity_iint_cache *iint, struct file *file); | 147 | void ima_update_xattr(struct integrity_iint_cache *iint, struct file *file); |
148 | 148 | ||
149 | #else | 149 | #else |
@@ -154,8 +154,8 @@ static inline int ima_appraise_measurement(struct integrity_iint_cache *iint, | |||
154 | return INTEGRITY_UNKNOWN; | 154 | return INTEGRITY_UNKNOWN; |
155 | } | 155 | } |
156 | 156 | ||
157 | static inline int ima_must_appraise(struct inode *inode, | 157 | static inline int ima_must_appraise(struct inode *inode, int mask, |
158 | enum ima_hooks func, int mask) | 158 | enum ima_hooks func) |
159 | { | 159 | { |
160 | return 0; | 160 | return 0; |
161 | } | 161 | } |
diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c index 0aa43bde441c..bdc8ba1d1d27 100644 --- a/security/integrity/ima/ima_appraise.c +++ b/security/integrity/ima/ima_appraise.c | |||
@@ -34,7 +34,7 @@ __setup("ima_appraise=", default_appraise_setup); | |||
34 | * | 34 | * |
35 | * Return 1 to appraise | 35 | * Return 1 to appraise |
36 | */ | 36 | */ |
37 | int ima_must_appraise(struct inode *inode, enum ima_hooks func, int mask) | 37 | int ima_must_appraise(struct inode *inode, int mask, enum ima_hooks func) |
38 | { | 38 | { |
39 | if (!ima_appraise) | 39 | if (!ima_appraise) |
40 | return 0; | 40 | return 0; |