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

Refactoring for internal change

Browse Source 
PiperOrigin-RevId: 320612442
Change-Id: I65729ac5d83c76dac047a47f866b7ad4af3c56c1
This commit is contained in:
Chris Kennelly 2020-07-10 09:01:17 -07:00 committed by Copybara-Service
parent c3861819bc
commit 63a8b3ff15
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sandboxed_api/sandbox2/BUILD.bazel
View File

@ -499,7 +499,6 @@ cc_library(
"//sandboxed_api/sandbox2/util:fileops", "//sandboxed_api/sandbox2/util:fileops",
"//sandboxed_api/sandbox2/util:strerror", "//sandboxed_api/sandbox2/util:strerror",
"//sandboxed_api/util:raw_logging", "//sandboxed_api/util:raw_logging",
"//sandboxed_api/util:status",
"//sandboxed_api/util:statusor", "//sandboxed_api/util:statusor",
"@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/strings", "@com_google_absl//absl/strings",

5
sandboxed_api/sandbox2/forkserver.cc
View File

@ -304,7 +304,10 @@ void ForkServer::LaunchChild(const ForkRequest& request, int execve_fd,
// A custom init process is only needed if a new PID NS is created. // A custom init process is only needed if a new PID NS is created.
if (request.clone_flags() & CLONE_NEWPID) { if (request.clone_flags() & CLONE_NEWPID) {
// Spawn a child process // Spawn a child process
pid_t child = fork(); pid_t child;
{
child = fork();
}
if (child < 0) { if (child < 0) {
SAPI_RAW_PLOG(FATAL, "Could not spawn init process"); SAPI_RAW_PLOG(FATAL, "Could not spawn init process");
} }

5
sandboxed_api/sandbox2/global_forkclient.cc
View File

@ -77,7 +77,10 @@ static void StartGlobalForkServer() {
"creating socket pair"); "creating socket pair");
// Fork the fork-server, and clean-up the resources (close remote sockets). // Fork the fork-server, and clean-up the resources (close remote sockets).
pid_t pid = fork(); pid_t pid;
{
pid = fork();
}
SAPI_RAW_PCHECK(pid != -1, "during fork"); SAPI_RAW_PCHECK(pid != -1, "during fork");
// Parent. // Parent.

5
sandboxed_api/sandbox2/util.cc
View File

@ -133,7 +133,10 @@ pid_t CloneAndJump(int flags, jmp_buf* env_ptr) {
#else #else
#error "Architecture is not supported" #error "Architecture is not supported"
#endif #endif
int r = clone(&ChildFunc, stack, flags, env_ptr, nullptr, nullptr, nullptr); int r;
{
r = clone(&ChildFunc, stack, flags, env_ptr, nullptr, nullptr, nullptr);
}
if (r == -1) { if (r == -1) {
SAPI_RAW_PLOG(ERROR, "clone()"); SAPI_RAW_PLOG(ERROR, "clone()");
} }