From: Richard Guy Briggs <rgb@redhat.com>
Date: Fri, 3 Oct 2014 02:05:18 +0000 (-0400)
Subject: audit: put rule existence check in canonical order
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3639f17068ed40e4e208a6e218481d49817bbd56;p=linux-beck.git

audit: put rule existence check in canonical order

Use same rule existence check order as audit_make_tree(), audit_to_watch(),
update_lsm_rule() for legibility.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
---

diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 40ed9813d4b2..4a11697cf5b8 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -163,7 +163,7 @@ static inline int audit_to_inode(struct audit_krule *krule,
 				 struct audit_field *f)
 {
 	if (krule->listnr != AUDIT_FILTER_EXIT ||
-	    krule->watch || krule->inode_f || krule->tree ||
+	    krule->inode_f || krule->watch || krule->tree ||
 	    (f->op != Audit_equal && f->op != Audit_not_equal))
 		return -EINVAL;