Commit: 9ab24048d625254825ddb51bb7368186615e7d9f - system-core (git)

system/core

Commit MetaInfo

• Revisão: 9ab24048d625254825ddb51bb7368186615e7d9f (tree)
• Hora: 2019-12-17 14:24:56
• Autor: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Mensagem de Log

init: don't bail out even no SELinux domain defined

Mudança Sumário

• modified: init/service.cpp

Diff

--- a/init/service.cpp
+++ b/init/service.cpp
@@ -29,6 +29,9 @@
 #include <sys/wait.h>
 #include <termios.h>
 #include <unistd.h>
+#if defined(__ANDROID__)
+#include <cutils/klog.h>
+#endif
 
 #include <android-base/file.h>
 #include <android-base/logging.h>
@@ -94,11 +97,17 @@ static Result<std::string> ComputeContextFromExecutable(const std::string& servi
         free(new_con);
     }
     if (rc == 0 && computed_context == mycon.get()) {
+#if defined(__ANDROID__)
+        KLOG_WARNING("service", "File %s (labeled \"%s\") has incorrect label or no domain transition from %s to another SELinux domain defined.",
+                service_path.c_str(), filecon.get(), mycon.get());
+        return "skip";
+#else
         return Error() << "File " << service_path << "(labeled \"" << filecon.get()
                        << "\") has incorrect label or no domain transition from " << mycon.get()
                        << " to another SELinux domain defined. Have you configured your "
                           "service correctly? https://source.android.com/security/selinux/"
                           "device-policy#label_new_services_and_address_denials";
+#endif
     }
     if (rc < 0) {
         return Error() << "Could not get process context";