aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/selinux.h6
-rw-r--r--security/selinux/ss/services.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/selinux.h b/include/linux/selinux.h
index df9098de4c99..d1b7ca6c1c57 100644
--- a/include/linux/selinux.h
+++ b/include/linux/selinux.h
@@ -46,7 +46,7 @@ void selinux_audit_rule_free(struct selinux_audit_rule *rule);
46 46
47/** 47/**
48 * selinux_audit_rule_match - determine if a context ID matches a rule. 48 * selinux_audit_rule_match - determine if a context ID matches a rule.
49 * @ctxid: the context ID to check 49 * @sid: the context ID to check
50 * @field: the field this rule refers to 50 * @field: the field this rule refers to
51 * @op: the operater the rule uses 51 * @op: the operater the rule uses
52 * @rule: pointer to the audit rule to check against 52 * @rule: pointer to the audit rule to check against
@@ -55,7 +55,7 @@ void selinux_audit_rule_free(struct selinux_audit_rule *rule);
55 * Returns 1 if the context id matches the rule, 0 if it does not, and 55 * Returns 1 if the context id matches the rule, 0 if it does not, and
56 * -errno on failure. 56 * -errno on failure.
57 */ 57 */
58int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op, 58int selinux_audit_rule_match(u32 sid, u32 field, u32 op,
59 struct selinux_audit_rule *rule, 59 struct selinux_audit_rule *rule,
60 struct audit_context *actx); 60 struct audit_context *actx);
61 61
@@ -144,7 +144,7 @@ static inline void selinux_audit_rule_free(struct selinux_audit_rule *rule)
144 return; 144 return;
145} 145}
146 146
147static inline int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op, 147static inline int selinux_audit_rule_match(u32 sid, u32 field, u32 op,
148 struct selinux_audit_rule *rule, 148 struct selinux_audit_rule *rule,
149 struct audit_context *actx) 149 struct audit_context *actx)
150{ 150{
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 22ed17c17718..988079f45294 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -2003,7 +2003,7 @@ int selinux_audit_rule_init(u32 field, u32 op, char *rulestr,
2003 return rc; 2003 return rc;
2004} 2004}
2005 2005
2006int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op, 2006int selinux_audit_rule_match(u32 sid, u32 field, u32 op,
2007 struct selinux_audit_rule *rule, 2007 struct selinux_audit_rule *rule,
2008 struct audit_context *actx) 2008 struct audit_context *actx)
2009{ 2009{
@@ -2026,11 +2026,11 @@ int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op,
2026 goto out; 2026 goto out;
2027 } 2027 }
2028 2028
2029 ctxt = sidtab_search(&sidtab, ctxid); 2029 ctxt = sidtab_search(&sidtab, sid);
2030 if (!ctxt) { 2030 if (!ctxt) {
2031 audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR, 2031 audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR,
2032 "selinux_audit_rule_match: unrecognized SID %d\n", 2032 "selinux_audit_rule_match: unrecognized SID %d\n",
2033 ctxid); 2033 sid);
2034 match = -ENOENT; 2034 match = -ENOENT;
2035 goto out; 2035 goto out;
2036 } 2036 }