aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Klementyev <jollheef@riseup.net>2015-05-25 16:20:38 -0400
committerPaul Moore <pmoore@redhat.com>2015-05-29 16:06:47 -0400
commit5c1390c9ffdaeb9f7e544cea3a1699a341cad1fb (patch)
treefc4cdfe9b69acc672724bcf783605a5af844d7eb
parent2201196479748b84e5526b2f81112fe2d0aaa37a (diff)
audit: obsolete audit_context check is removed in audit_filter_rules()
Signed-off-by: Mikhail Klementyev <jollheef@riseup.net> [PM: patch applied by hand due to HTML mangling, rewrote subject line] Signed-off-by: Paul Moore <pmoore@redhat.com>
-rw-r--r--kernel/auditsc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index dc4ae70a7413..d81424fbec3a 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -599,9 +599,7 @@ static int audit_filter_rules(struct task_struct *tsk,
599 result = match_tree_refs(ctx, rule->tree); 599 result = match_tree_refs(ctx, rule->tree);
600 break; 600 break;
601 case AUDIT_LOGINUID: 601 case AUDIT_LOGINUID:
602 result = 0; 602 result = audit_uid_comparator(tsk->loginuid, f->op, f->uid);
603 if (ctx)
604 result = audit_uid_comparator(tsk->loginuid, f->op, f->uid);
605 break; 603 break;
606 case AUDIT_LOGINUID_SET: 604 case AUDIT_LOGINUID_SET:
607 result = audit_comparator(audit_loginuid_set(tsk), f->op, f->val); 605 result = audit_comparator(audit_loginuid_set(tsk), f->op, f->val);