---

yaml --- r: 184906 b: refs/heads/master c: b6cac5a h: refs/heads/master v: v3
git-mirror · Feb 2, 2010 · 01c1d51 · 01c1d51
1 parent 5f1ffc4
commit 01c1d51
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e2d39a1665e680c095545993aac2fcac6916eb9
+refs/heads/master: b6cac5a30b325e14cda425670bb3568d3cad0aa8
diff --git a/trunk/security/selinux/avc.c b/trunk/security/selinux/avc.c
@@ -489,17 +489,14 @@ void avc_audit(u32 ssid, u32 tsid,
 	struct common_audit_data stack_data;
 	u32 denied, audited;
 	denied = requested & ~avd->allowed;
-	if (denied) {
-		audited = denied;
-		if (!(audited & avd->auditdeny))
-			return;
-	} else if (result) {
+	if (denied)
+		audited = denied & avd->auditdeny;
+	else if (result)
 		audited = denied = requested;
-	} else {
-		audited = requested;
-		if (!(audited & avd->auditallow))
-			return;
-	}
+	else
+		audited = requested & avd->auditallow;
+	if (!audited)
+		return;
 	if (!a) {
 		a = &stack_data;
 		memset(a, 0, sizeof(*a));