From: Mikhail Klementyev <jollheef@riseup.net>
Date: Mon, 25 May 2015 20:20:38 +0000 (+0300)
Subject: audit: obsolete audit_context check is removed in audit_filter_rules()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5c1390c9ffdaeb9f7e544cea3a1699a341cad1fb;p=linux-beck.git

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>
---

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);