Merge "init/service.cpp: fix FD leak for services with consoles" am: 4173d9b57c am: 869ce5d40a

am: 9bebb6f3a3

Change-Id: Id9c363a2fc3519c2c821be8b7e5511150f85dd26
This commit is contained in:
Nick Kralevich 2016-12-10 22:24:07 +00:00 committed by android-build-merger
commit 90007c54c2

View file

@ -567,9 +567,9 @@ bool Service::Start() {
console_ = default_console;
}
bool have_console = (open(console_.c_str(), O_RDWR | O_CLOEXEC) != -1);
bool have_console = (access(console_.c_str(), R_OK | W_OK) != -1);
if (!have_console) {
PLOG(ERROR) << "service '" << name_ << "' couldn't open console '" << console_ << "'";
PLOG(ERROR) << "service '" << name_ << "' cannot gain read/write access to console '" << console_ << "'";
flags_ |= SVC_DISABLED;
return false;
}