pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "init: Cleanly exit subcontext processes upon init's death"

This commit is contained in:
Treehugger Robot 2018-09-22 00:12:09 +00:00 committed by Gerrit Code Review
parent 6aaff2fe7d 7235359d2e
commit f86e85cb0a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
init/subcontext.cpp
View File

@ -62,7 +62,9 @@ constexpr size_t kBufferSize = 4096;
Result<std::string> ReadMessage(int socket) { Result<std::string> ReadMessage(int socket) {
char buffer[kBufferSize] = {}; char buffer[kBufferSize] = {};
auto result = TEMP_FAILURE_RETRY(recv(socket, buffer, sizeof(buffer), 0)); auto result = TEMP_FAILURE_RETRY(recv(socket, buffer, sizeof(buffer), 0));
if (result <= 0) { if (result == 0) {
return Error();
} else if (result < 0) {
return ErrnoError(); return ErrnoError();
} }
return std::string(buffer, result); return std::string(buffer, result);
@ -175,6 +177,12 @@ void SubcontextProcess::MainLoop() {
auto init_message = ReadMessage(init_fd_); auto init_message = ReadMessage(init_fd_);
if (!init_message) { if (!init_message) {
if (init_message.error_errno() == 0) {
// If the init file descriptor was closed, let's exit quietly. If
// this was accidental, init will restart us. If init died, this
// avoids calling abort(3) unnecessarily.
return;
}
LOG(FATAL) << "Could not read message from init: " << init_message.error(); LOG(FATAL) << "Could not read message from init: " << init_message.error();
} }