aboutsummaryrefslogtreecommitdiffstats
path: root/security/integrity/ima/ima.h
diff options
context:
space:
mode:
authorDmitry Kasatkin <dmitry.kasatkin@intel.com>2012-09-27 11:26:53 -0400
committerJames Morris <james.l.morris@oracle.com>2012-10-05 08:32:16 -0400
commitd26e1936227b538a1691b978566ef269aef10853 (patch)
treec1b803d6177f6c39932a159c7bdb2c557497e16f /security/integrity/ima/ima.h
parentecefbd94b834fa32559d854646d777c56749ef1c (diff)
ima: fix bug in argument order
mask argument goes first, then func, like ima_must_measure and ima_get_action. ima_inode_post_setattr() assumes that. Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com> Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'security/integrity/ima/ima.h')
-rw-r--r--security/integrity/ima/ima.h6
1 files changed, 3 insertions, 3 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
144int ima_appraise_measurement(struct integrity_iint_cache *iint, 144int ima_appraise_measurement(struct integrity_iint_cache *iint,
145 struct file *file, const unsigned char *filename); 145 struct file *file, const unsigned char *filename);
146int ima_must_appraise(struct inode *inode, enum ima_hooks func, int mask); 146int ima_must_appraise(struct inode *inode, int mask, enum ima_hooks func);
147void ima_update_xattr(struct integrity_iint_cache *iint, struct file *file); 147void 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
157static inline int ima_must_appraise(struct inode *inode, 157static 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}