summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Klementyev <jollheef@riseup.net>2015-05-25 22:20:38 +0200
committerPaul Moore <pmoore@redhat.com>2015-05-29 22:06:47 +0200
commit5c1390c9ffdaeb9f7e544cea3a1699a341cad1fb (patch)
treefc4cdfe9b69acc672724bcf783605a5af844d7eb
parentaudit: fix for typo in comment to function audit_log_link_denied() (diff)
downloadlinux-5c1390c9ffdaeb9f7e544cea3a1699a341cad1fb.tar.xz
linux-5c1390c9ffdaeb9f7e544cea3a1699a341cad1fb.zip
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,
result = match_tree_refs(ctx, rule->tree);
break;
case AUDIT_LOGINUID:
- result = 0;
- if (ctx)
- result = audit_uid_comparator(tsk->loginuid, f->op, f->uid);
+ result = audit_uid_comparator(tsk->loginuid, f->op, f->uid);
break;
case AUDIT_LOGINUID_SET:
result = audit_comparator(audit_loginuid_set(tsk), f->op, f->val);