diff options
| author | Stephen Smalley <sds@tycho.nsa.gov> | 2006-09-26 02:31:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 11:48:52 -0400 |
| commit | 9a2f44f01a67a6ecca71515af999895b45a2aeb0 (patch) | |
| tree | badb3047f9a80013ad0d00a413f6ca038ba3f3ce /security | |
| parent | 1a70cd40cb291c25b67ec0da715a49d76719329d (diff) | |
[PATCH] selinux: replace ctxid with sid in selinux_audit_rule_match interface
Replace ctxid with sid in selinux_audit_rule_match interface for
consistency with other interfaces.
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/ss/services.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 22ed17c177..988079f452 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 | ||
| 2006 | int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op, | 2006 | int 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 | } |
