StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

Allow recovering from global forkserver failure

Browse Source 
PiperOrigin-RevId: 389164847
Change-Id: I40bc3b6d3bea28ee8954ea2a11a0427a6c05da35
This commit is contained in:
Wiktor Garbacz 2021-08-06 06:53:27 -07:00 committed by Copybara-Service
parent fe709502f4
commit 0621e06a9c
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sandboxed_api/sandbox2/global_forkclient.cc
View File

@ -160,6 +160,13 @@ std::unique_ptr<GlobalForkClient> StartGlobalForkServer() {
return absl::make_unique<GlobalForkClient>(sv[1], pid); return absl::make_unique<GlobalForkClient>(sv[1], pid);
} }
void WaitForForkserver(pid_t pid) {
pid_t wpid = TEMP_FAILURE_RETRY(waitpid(pid, nullptr, 0));
if (wpid != pid) {
SAPI_RAW_PLOG(ERROR, "Waiting for %d failed", pid);
}
}
} // namespace } // namespace
absl::Mutex GlobalForkClient::instance_mutex_(absl::kConstInit); absl::Mutex GlobalForkClient::instance_mutex_(absl::kConstInit);
@ -204,22 +211,26 @@ void GlobalForkClient::Shutdown() {
instance_ = nullptr; instance_ = nullptr;
} }
if (pid != -1) { if (pid != -1) {
pid_t wpid = TEMP_FAILURE_RETRY(waitpid(pid, nullptr, 0)); WaitForForkserver(pid);
if (wpid != pid) {
SAPI_RAW_PLOG(ERROR, "Waiting for %d failed", pid);
}
} }
} }
pid_t GlobalForkClient::SendRequest(const ForkRequest& request, int exec_fd, pid_t GlobalForkClient::SendRequest(const ForkRequest& request, int exec_fd,
int comms_fd, int user_ns_fd, int comms_fd, int user_ns_fd,
pid_t* init_pid) { pid_t* init_pid) {
absl::MutexLock lock(&GlobalForkClient::instance_mutex_); absl::ReleasableMutexLock lock(&GlobalForkClient::instance_mutex_);
EnsureStartedLocked(GlobalForkserverStartMode::kOnDemand); EnsureStartedLocked(GlobalForkserverStartMode::kOnDemand);
pid_t pid = instance_->fork_client_.SendRequest(request, exec_fd, comms_fd, pid_t pid = instance_->fork_client_.SendRequest(request, exec_fd, comms_fd,
user_ns_fd, init_pid); user_ns_fd, init_pid);
if (instance_->comms_.IsTerminated()) { if (instance_->comms_.IsTerminated()) {
LOG(ERROR) << "Global forkserver connection terminated"; LOG(ERROR) << "Global forkserver connection terminated";
pid_t server_pid = instance_->fork_client_.pid();
delete instance_;
instance_ = nullptr;
// Don't wait for process exit while still holding the lock and potentially
// blocking other threads.
lock.Release();
WaitForForkserver(server_pid);
} }
return pid; return pid;
} }