integrity: lsm audit rule matching fix
Subsystems (3)
PATCH 1/1 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.
security/integrity/ima/ima_policy.c +4 -4
@@ -96,7 +96,7 @@ static bool ima_match_rules(struct ima_mif ((rule->flags &IMA_UID ) && rule->uid != tsk->cred->uid)return false;for (i =0 ; i <MAX_LSM_RULES ; i++) { -int rc; +int rc =0 ;u32 osid, sid;if (!rule->lsm[i].rule)
@@ -109,7 +109,7 @@ static bool ima_match_rules(struct ima_msecurity_inode_getsecid (inode, &osid); rc =security_filter_rule_match (osid, rule->lsm[i].type, -AUDIT_EQUAL , + Audit_equal, rule->lsm[i].rule,NULL );break ;
@@ -119,7 +119,7 @@ static bool ima_match_rules(struct ima_msecurity_task_getsecid (tsk, &sid); rc =security_filter_rule_match (sid, rule->lsm[i].type, -AUDIT_EQUAL , + Audit_equal, rule->lsm[i].rule,NULL );default :
@@ -227,7 +227,7 @@ static int ima_lsm_rule_init(struct ima_ entry->lsm[lsm_rule].type = audit_type; result =security_filter_rule_init (entry->lsm[lsm_rule].type, -AUDIT_EQUAL , args, + Audit_equal, args, &entry->lsm[lsm_rule].rule);return result; }
James Morris
maintainerQuoted 9 lines · Mimi Zohar
An audit subsystem change replaced
AUDIT_EQUALwithAudit_equal. Update calls to security_filter_rule_init()/match() to reflect the change.Index:
security-testing-2.6/security/integrity/ima/ima_policy.c
===================================================================
security/integrity/ima/ima_policy.c static bool ima_match_rules(struct ima_m · line 99
Quoted 5 lines
security/integrity/ima/ima_policy.c +1
-1@@ -96,7 +96,7 @@ static bool ima_match_rules(struct ima_mif ((rule->flags &IMA_UID ) && rule->uid != tsk->cred->uid)return false;for (i =0 ; i <MAX_LSM_RULES ; i++) { -int rc; +int rc =0 ;
Why did you change this?
Signature · 2 lines
James Morris <[email protected]>
James Morris
maintainerQuoted 6 lines · James Morris
Quoted 4 lines · Mimi Zohar
An audit subsystem change replaced
AUDIT_EQUALwithAudit_equal. Update calls to security_filter_rule_init()/match() to reflect the change.
Quoted 11 lines
security/integrity/ima/ima_policy.c static bool ima_match_rules(struct ima_m · line 99
Quoted 10 lines
Index:
security-testing-2.6/security/integrity/ima/ima_policy.c
===================================================================security/integrity/ima/ima_policy.c +1
-1@@ -96,7 +96,7 @@ static bool ima_match_rules(struct ima_mif ((rule->flags &IMA_UID ) && rule->uid != tsk->cred->uid)return false;for (i =0 ; i <MAX_LSM_RULES ; i++) { -int rc; +int rc =0 ;
Also, please add a Signed-off-by.
Signature · 2 lines
James Morris <[email protected]>
An audit subsystem change replaced AUDIT_EQUAL with Audit_equal. Update calls to security_filter_rule_init()/match() to reflect the change.
security/integrity/ima/ima_policy.c +4 -4
@@ -96,7 +96,7 @@ static bool ima_match_rules(struct ima_mif ((rule->flags &IMA_UID ) && rule->uid != tsk->cred->uid)return false;for (i =0 ; i <MAX_LSM_RULES ; i++) { -int rc; +int rc =0 ;u32 osid, sid;if (!rule->lsm[i].rule)
@@ -109,7 +109,7 @@ static bool ima_match_rules(struct ima_msecurity_inode_getsecid (inode, &osid); rc =security_filter_rule_match (osid, rule->lsm[i].type, -AUDIT_EQUAL , + Audit_equal, rule->lsm[i].rule,NULL );break ;
@@ -119,7 +119,7 @@ static bool ima_match_rules(struct ima_msecurity_task_getsecid (tsk, &sid); rc =security_filter_rule_match (sid, rule->lsm[i].type, -AUDIT_EQUAL , + Audit_equal, rule->lsm[i].rule,NULL );default :
@@ -227,7 +227,7 @@ static int ima_lsm_rule_init(struct ima_ entry->lsm[lsm_rule].type = audit_type; result =security_filter_rule_init (entry->lsm[lsm_rule].type, -AUDIT_EQUAL , args, + Audit_equal, args, &entry->lsm[lsm_rule].rule);return result; }
Quoted 6 lines · James Morris
Quoted 4 lines · Mimi Zohar
An audit subsystem change replaced
AUDIT_EQUALwithAudit_equal. Update calls to security_filter_rule_init()/match() to reflect the change.
Quoted 12 lines
security/integrity/ima/ima_policy.c static bool ima_match_rules(struct ima_m · line 99
Quoted 10 lines
Index:
security-testing-2.6/security/integrity/ima/ima_policy.c
===================================================================security/integrity/ima/ima_policy.c +1
-1@@ -96,7 +96,7 @@ static bool ima_match_rules(struct ima_mif ((rule->flags &IMA_UID ) && rule->uid != tsk->cred->uid)return false;for (i =0 ; i <MAX_LSM_RULES ; i++) { -int rc; +int rc =0 ;Why did you change this?
Based on a reported compiler warning error.
Mimi