sandboxed-api/sandboxed_api/sandbox2/fork_client.cc
Wiktor Garbacz 7a57d32711 forkserver: Remove waitpid flag
It was superseded by sandboxee rusage when using unotify monitor

PiperOrigin-RevId: 557396642
Change-Id: I41f84149227f62d4b7727030f9359834a9b61dbc
2023-08-16 01:33:12 -07:00

78 lines
2.5 KiB
C++

// Copyright 2020 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "sandboxed_api/sandbox2/fork_client.h"
#include "absl/log/check.h"
#include "absl/log/log.h"
#include "sandboxed_api/sandbox2/comms.h"
#include "sandboxed_api/sandbox2/forkserver.pb.h"
namespace sandbox2 {
using ::sapi::file_util::fileops::FDCloser;
SandboxeeProcess ForkClient::SendRequest(const ForkRequest& request,
int exec_fd, int comms_fd) {
SandboxeeProcess process;
// Acquire the channel ownership for this request (transaction).
absl::MutexLock l(&comms_mutex_);
if (!comms_->SendProtoBuf(request)) {
LOG(ERROR) << "Sending PB to the ForkServer failed";
return process;
}
CHECK(comms_fd != -1) << "comms_fd was not properly set up";
if (!comms_->SendFD(comms_fd)) {
LOG(ERROR) << "Sending Comms FD (" << comms_fd
<< ") to the ForkServer failed";
return process;
}
if (request.mode() == FORKSERVER_FORK_EXECVE ||
request.mode() == FORKSERVER_FORK_EXECVE_SANDBOX) {
CHECK(exec_fd != -1) << "exec_fd cannot be -1 in execve mode";
if (!comms_->SendFD(exec_fd)) {
LOG(ERROR) << "Sending Exec FD (" << exec_fd
<< ") to the ForkServer failed";
return process;
}
}
int32_t pid;
// Receive init process ID.
if (!comms_->RecvInt32(&pid)) {
LOG(ERROR) << "Receiving init PID from the ForkServer failed";
return process;
}
process.init_pid = static_cast<pid_t>(pid);
// Receive sandboxee process ID.
if (!comms_->RecvInt32(&pid)) {
LOG(ERROR) << "Receiving sandboxee PID from the ForkServer failed";
return process;
}
process.main_pid = static_cast<pid_t>(pid);
if (request.monitor_type() == FORKSERVER_MONITOR_UNOTIFY) {
int fd = -1;
if (!comms_->RecvFD(&fd)) {
LOG(ERROR) << "Receiving status fd from the ForkServer failed";
return process;
}
process.status_fd = FDCloser(fd);
}
return process;
}
} // namespace sandbox2