commit 7e18369726063122b36105e40dbb08e805bfb4e5
author Nick Kralevich <nnk@google.com> Sat Feb 27 04:20:02 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Feb 27 04:20:02 2016 +0000
tree 58d2d172a00b56c9b44c349cde557ecc6da60582
parent 4cab2d4c5b6e41f6b04c15ababe2f044cea6c78c
parent 58f5fea5096d7b0a7b22066ec4dc4c0e85cc5551

logd: Don\'t trigger an integrity failure on permissive SELinux denials
am: 33ee84f871

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