Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ima: fix erroneous removal of security.ima xattr

Browse source 
ima_inode_post_setattr() calls ima_must_appraise() to check if the
file needs to be appraised. If it does not then it removes security.ima
xattr. With original policy matching code it might happen that even
file needs to be appraised with FILE_CHECK hook, it might not be
for POST_SETATTR hook. 'security.ima' might be erronously removed.

This patch treats POST_SETATTR as special wildcard function and will
cause ima_must_appraise() to be true if any of the hooks rules matches.
security.ima will not be removed if any of the hooks would require
appraisal.

Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
This commit is contained in:
Dmitry Kasatkin 2013-11-13 23:42:39 +02:00 committed by Mimi Zohar
parent 20ee451f5a
commit 09b1148ef5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
security/integrity/ima/ima_policy.c
View file

@ -167,9 +167,11 @@ static bool ima_match_rules(struct ima_rule_entry *rule,
const struct cred *cred = current_cred(); const struct cred *cred = current_cred();
int i; int i;
if ((rule->flags & IMA_FUNC) && rule->func != func) if ((rule->flags & IMA_FUNC) &&
(rule->func != func && func != POST_SETATTR))
return false; return false;
if ((rule->flags & IMA_MASK) && rule->mask != mask) if ((rule->flags & IMA_MASK) &&
(rule->mask != mask && func != POST_SETATTR))
return false; return false;
if ((rule->flags & IMA_FSMAGIC) if ((rule->flags & IMA_FSMAGIC)
&& rule->fsmagic != inode->i_sb->s_magic) && rule->fsmagic != inode->i_sb->s_magic)