commit 5195f61e9f193a645be38948a422149c943314f3
author Nick Kralevich <nnk@google.com> Sat Feb 27 16:38:42 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Feb 27 16:38:42 2016 +0000
tree e8d3af63d9719d66c362021f2cb72beaa5efe3ec
parent 7e18369726063122b36105e40dbb08e805bfb4e5
parent e1f84475c177a2d81b40b25331935a09a1fcd92f

Revert "logd: Don\'t trigger an integrity failure on permissive SELinux denials"
am: 99fb01e42a

* commit '99fb01e42a184fa8a206c84be12b7e34cc2947bb':
  Revert "logd: Don't trigger an integrity failure on permissive SELinux denials"

logd/LogAudit.cpp

diff --git a/logd/LogAudit.cpp b/logd/LogAudit.cpp
index 7c35dc6..230dd11 100644
--- a/logd/LogAudit.cpp
+++ b/logd/LogAudit.cpp
@@ -155,15 +155,15 @@
         }
     }
 
-    bool notEnforcing = strstr(str, " enforcing=0");
-    bool permissive = strstr(str, " permissive=1");
+    bool permissive = strstr(str, " enforcing=0") ||
+                      strstr(str, " permissive=1");
 
-    if (notEnforcing) {
+    if (permissive) {
         // SELinux in permissive mode is not allowed
         enforceIntegrity();
     }
 
-    bool info = loaded || permissive || notEnforcing;
+    bool info = loaded || permissive;
     if ((fdDmesg >= 0) && initialized) {
         struct iovec iov[3];
         static const char log_info[] = { KMSG_PRIORITY(LOG_INFO) };