commit d33bc96aaff1806b936376e88006f4d07bbdbdcb
author Adrian Salido <salidoa@google.com> Tue Jan 03 23:36:36 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 03 23:36:36 2017 +0000
tree adb4bbd850a7d1db2b3864e709ed4edd9bc99c85
parent f4ae3875c0a6dbe3f046cdd70c28db8638b6cd23
parent 4f0fde2f7d3003c7ad1ccf9ef23d69361069fc01

Merge "init/service.cpp: fix access check for console" am: 4a3b03e9e5 am: 7cc669c493 am: 08cbedfb14
am: 9d4179dada

Change-Id: Ifee9f10f537386d07ea2fd93f5faece74bad1a22

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 7cff348..0f7f62f 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -582,12 +582,15 @@
             console_ = default_console;
         }
 
-        bool have_console = (access(console_.c_str(), R_OK | W_OK) != -1);
-        if (!have_console) {
-            PLOG(ERROR) << "service '" << name_ << "' cannot gain read/write access to console '" << console_ << "'";
+        // Make sure that open call succeeds to ensure a console driver is
+        // properly registered for the device node
+        int console_fd = open(console_.c_str(), O_RDWR | O_CLOEXEC);
+        if (console_fd < 0) {
+            PLOG(ERROR) << "service '" << name_ << "' couldn't open console '" << console_ << "'";
             flags_ |= SVC_DISABLED;
             return false;
         }
+        close(console_fd);
     }
 
     struct stat sb;