leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ima: fix bug in argument order

Browse Source 
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>
This commit is contained in:
Dmitry Kasatkin 2012-09-27 18:26:53 +03:00 committed by James Morris
parent ecefbd94b8
commit d26e193622
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/integrity/ima/ima.h
View File

@ -143,7 +143,7 @@ void ima_delete_rules(void);
#ifdef CONFIG_IMA_APPRAISE #ifdef CONFIG_IMA_APPRAISE
int ima_appraise_measurement(struct integrity_iint_cache *iint, int ima_appraise_measurement(struct integrity_iint_cache *iint,
struct file *file, const unsigned char *filename); struct file *file, const unsigned char *filename);
int ima_must_appraise(struct inode *inode, enum ima_hooks func, int mask); int ima_must_appraise(struct inode *inode, int mask, enum ima_hooks func);
void ima_update_xattr(struct integrity_iint_cache *iint, struct file *file); void ima_update_xattr(struct integrity_iint_cache *iint, struct file *file);
#else #else
@ -154,8 +154,8 @@ static inline int ima_appraise_measurement(struct integrity_iint_cache *iint,
return INTEGRITY_UNKNOWN; return INTEGRITY_UNKNOWN;
} }
static inline int ima_must_appraise(struct inode *inode, static inline int ima_must_appraise(struct inode *inode, int mask,
enum ima_hooks func, int mask) enum ima_hooks func)
{ {
return 0; return 0;
} }

2
security/integrity/ima/ima_appraise.c
View File

@ -34,7 +34,7 @@ __setup("ima_appraise=", default_appraise_setup);
* *
* Return 1 to appraise * Return 1 to appraise
*/ */
int ima_must_appraise(struct inode *inode, enum ima_hooks func, int mask) int ima_must_appraise(struct inode *inode, int mask, enum ima_hooks func)
{ {
if (!ima_appraise) if (!ima_appraise)
return 0; return 0;