summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorSteve Grubb <sgrubb@redhat.com>2006-04-11 08:50:56 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2006-05-01 06:10:07 -0400
commit2ad312d2093ae506ae0fa184d8d026b559083087 (patch)
tree890337ebca18ab31546b84a9831fb9c337e8e272 /kernel
parent073115d6b29c7910feaa08241c6484637f5ca958 (diff)
downloadop-kernel-dev-2ad312d2093ae506ae0fa184d8d026b559083087.zip
op-kernel-dev-2ad312d2093ae506ae0fa184d8d026b559083087.tar.gz
[PATCH] Audit Filter Performance
While testing the watch performance, I noticed that selinux_task_ctxid() was creeping into the results more than it should. Investigation showed that the function call was being called whether it was needed or not. The below patch fixes this. Signed-off-by: Steve Grubb <sgrubb@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/auditsc.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index a300736..1c03a4e 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -168,11 +168,9 @@ static int audit_filter_rules(struct task_struct *tsk,
struct audit_context *ctx,
enum audit_state *state)
{
- int i, j;
+ int i, j, need_sid = 1;
u32 sid;
- selinux_task_ctxid(tsk, &sid);
-
for (i = 0; i < rule->field_count; i++) {
struct audit_field *f = &rule->fields[i];
int result = 0;
@@ -271,11 +269,16 @@ static int audit_filter_rules(struct task_struct *tsk,
match for now to avoid losing information that
may be wanted. An error message will also be
logged upon error */
- if (f->se_rule)
+ if (f->se_rule) {
+ if (need_sid) {
+ selinux_task_ctxid(tsk, &sid);
+ need_sid = 0;
+ }
result = selinux_audit_rule_match(sid, f->type,
f->op,
f->se_rule,
ctx);
+ }
break;
case AUDIT_ARG0:
case AUDIT_ARG1:
OpenPOWER on IntegriCloud