ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init/service.cpp: fix access check for console"

Browse source
This commit is contained in:
Treehugger Robot 2017-01-03 23:27:39 +00:00 • committed by Gerrit Code Review
commit 4a3b03e9e5
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
init/service.cpp
View file

@ -582,12 +582,15 @@ bool Service::Start() {
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;