aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2009-05-05 13:12:48 -0400
committerJames Morris <jmorris@namei.org>2009-05-05 20:35:53 -0400
commit53fc0e2259f261602a2750dcc82b8d7bf04d3c35 (patch)
tree09eaec1b928d433cc50485331bc75f1f2529d0e9 /security
parent78a3d9d5654a7fd99cf8b2ab06b9497b9c7aad64 (diff)
integrity: lsm audit rule matching fix
An audit subsystem change replaced AUDIT_EQUAL with Audit_equal. Update calls to security_filter_rule_init()/match() to reflect the change. Signed-off-by: Mimi Zohar <zohar@us.ibm.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/ima_policy.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index b5291ad5ef56..b168c1d595ce 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -96,7 +96,7 @@ static bool ima_match_rules(struct ima_measure_rule_entry *rule,
96 if ((rule->flags & IMA_UID) && rule->uid != tsk->cred->uid) 96 if ((rule->flags & IMA_UID) && rule->uid != tsk->cred->uid)
97 return false; 97 return false;
98 for (i = 0; i < MAX_LSM_RULES; i++) { 98 for (i = 0; i < MAX_LSM_RULES; i++) {
99 int rc; 99 int rc = 0;
100 u32 osid, sid; 100 u32 osid, sid;
101 101
102 if (!rule->lsm[i].rule) 102 if (!rule->lsm[i].rule)
@@ -109,7 +109,7 @@ static bool ima_match_rules(struct ima_measure_rule_entry *rule,
109 security_inode_getsecid(inode, &osid); 109 security_inode_getsecid(inode, &osid);
110 rc = security_filter_rule_match(osid, 110 rc = security_filter_rule_match(osid,
111 rule->lsm[i].type, 111 rule->lsm[i].type,
112 AUDIT_EQUAL, 112 Audit_equal,
113 rule->lsm[i].rule, 113 rule->lsm[i].rule,
114 NULL); 114 NULL);
115 break; 115 break;
@@ -119,7 +119,7 @@ static bool ima_match_rules(struct ima_measure_rule_entry *rule,
119 security_task_getsecid(tsk, &sid); 119 security_task_getsecid(tsk, &sid);
120 rc = security_filter_rule_match(sid, 120 rc = security_filter_rule_match(sid,
121 rule->lsm[i].type, 121 rule->lsm[i].type,
122 AUDIT_EQUAL, 122 Audit_equal,
123 rule->lsm[i].rule, 123 rule->lsm[i].rule,
124 NULL); 124 NULL);
125 default: 125 default:
@@ -227,7 +227,7 @@ static int ima_lsm_rule_init(struct ima_measure_rule_entry *entry,
227 227
228 entry->lsm[lsm_rule].type = audit_type; 228 entry->lsm[lsm_rule].type = audit_type;
229 result = security_filter_rule_init(entry->lsm[lsm_rule].type, 229 result = security_filter_rule_init(entry->lsm[lsm_rule].type,
230 AUDIT_EQUAL, args, 230 Audit_equal, args,
231 &entry->lsm[lsm_rule].rule); 231 &entry->lsm[lsm_rule].rule);
232 return result; 232 return result;
233} 233}